239029 2022-04-09 06:54:17 -0700 Line clamp specific line-count code should be in RenderDeprecatedFlexibleBox 2022-04-15 09:19:06 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok darin esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1860013 0 zalan 2022-04-09 06:54:17 -0700 ssia 1860014 1 457162 zalan 2022-04-09 06:58:27 -0700 Created attachment 457162 Patch 1860015 2 457163 zalan 2022-04-09 07:08:40 -0700 Created attachment 457163 Patch 1860024 3 457167 zalan 2022-04-09 09:23:21 -0700 Created attachment 457167 Patch 1860077 4 457187 zalan 2022-04-09 21:15:08 -0700 Created attachment 457187 Patch 1860108 5 457199 zalan 2022-04-10 06:59:41 -0700 Created attachment 457199 Patch 1860148 6 ews-feeder 2022-04-10 14:57:30 -0700 Committed r292689 (249481@main): <https://commits.webkit.org/249481@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457199. 1860149 7 webkit-bug-importer 2022-04-10 14:58:16 -0700 <rdar://problem/91539294> 1860336 8 457199 darin 2022-04-11 10:17:23 -0700 Comment on attachment 457199 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457199&action=review > Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:1035 > + maxLineCount = std::max<int>(maxLineCount, lineCountFor(downcast<RenderBlockFlow>(*child))); Chopping the size_t down to int; what makes that safe? Should the function check for overflow and return an int? > Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:1050 > + int lineCount = lineCountFor(blockChild); Ditto. 1861825 9 zalan 2022-04-15 09:19:06 -0700 (In reply to Darin Adler from comment #8) > Comment on attachment 457199 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457199&action=review > > > Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:1035 > > + maxLineCount = std::max<int>(maxLineCount, lineCountFor(downcast<RenderBlockFlow>(*child))); > > Chopping the size_t down to int; what makes that safe? Should the function > check for overflow and return an int? > > > Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:1050 > > + int lineCount = lineCountFor(blockChild); > > Ditto. bug 239389 457162 2022-04-09 06:58:27 -0700 2022-04-09 07:08:38 -0700 Patch bug-239029-20220409065826.patch text/plain 2999 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThlMTYwNjQ5MzlmMGZl ZjQ3NTdjNGY0MGJmMTdiODM1ZDQwMjg0Yi4uNzBkOWQyNDZjMDA4MDBhYzBiZWE4MGNkOTY5YjIy ZmMyMDlmMjQxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA0LTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5lIGNsYW1wIHNwZWNpZmlj IGxpbmUtY291bnQgY29kZSBzaG91bGQgYmUgaW4gUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkwMjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlz IGluIHByZXBhcmF0aW9uIGZvciBjbGVhbmluZyB1cCB0aGUgbGluZSBjb3VudCBsb2dpYyBpbiBS ZW5kZXJCbG9ja0Zsb3cgYnkKKyAgICAgICAgbWFraW5nIGl0ICJjaGlsZHJlbklubGluZSIgb25s eS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6bGluZUNvdW50Rm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXApOgorCiAyMDIyLTA0LTA4 ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChT YWZhcmkgMTUuNCk6IEZvY3VzZWQgZWxlbWVudCBkb2Vzbid0IHJlbmRlciBvdXRsaW5lIHdoZW4g aXQgaGFzIGFuIHVuZGVybGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAppbmRleCBhMDZlNWYzYmE3NjQ4NzVk ZDY3ZjcxMDYwNzcyOTQ2NGM3NDEyODJhLi4yZDk4YTk3M2M0ZjgwMDkyZDU0YmZkNGRiMzgxYTYy NDM5MzNiYTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcApAQCAtOTk1LDYgKzk5NSwyMyBAQCBzdGF0aWMg aW50IGhlaWdodEZvckxpbmVDb3VudChjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIGludCBs aW5lQ291bnQpCiAgICAgcmV0dXJuIGdldEhlaWdodEZvckxpbmVDb3VudChmbG93LCBsaW5lQ291 bnQsIHRydWUsIGNvdW50KTsKIH0KIAorc3RhdGljIHNpemVfdCBsaW5lQ291bnRGb3IoY29uc3Qg UmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3cpCit7CisgICAgaWYgKGJsb2NrRmxvdy5zdHlsZSgp LnZpc2liaWxpdHkoKSAhPSBWaXNpYmlsaXR5OjpWaXNpYmxlKQorICAgICAgICByZXR1cm4gMDsK KworICAgIGlmIChibG9ja0Zsb3cuY2hpbGRyZW5JbmxpbmUoKSkKKyAgICAgICAgcmV0dXJuIGJs b2NrRmxvdy5saW5lQ291bnQoKTsKKworICAgIHNpemVfdCBjb3VudCA9IDA7CisgICAgZm9yIChh dXRvJiBjaGlsZCA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlckJsb2NrRmxvdz4oYmxvY2tGbG93KSkg eworICAgICAgICBpZiAoYmxvY2tGbG93LmlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQo KSB8fCAhYmxvY2tGbG93LnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkpCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgY291bnQgKz0gbGluZUNvdW50Rm9yKGNoaWxkKTsKKyAgICB9Cisg ICAgcmV0dXJuIGNvdW50OworfQorCiB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6 YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbCByZWxheW91dENo aWxkcmVuKQogewogICAgIGludCBtYXhMaW5lQ291bnQgPSAwOwpAQCAtMTAxNSw3ICsxMDMyLDcg QEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGluZUNsYW1wKEZsZXhC b3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wKICAgICAgICAgfQogICAgICAgICBjaGlsZC0+bGF5 b3V0SWZOZWVkZWQoKTsKICAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhlaWdodCgpLmlzQXV0 bygpICYmIGlzPFJlbmRlckJsb2NrRmxvdz4oKmNoaWxkKSkKLSAgICAgICAgICAgIG1heExpbmVD b3VudCA9IHN0ZDo6bWF4KG1heExpbmVDb3VudCwgZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93Pigq Y2hpbGQpLmxpbmVDb3VudCgpKTsKKyAgICAgICAgICAgIG1heExpbmVDb3VudCA9IHN0ZDo6bWF4 PGludD4obWF4TGluZUNvdW50LCBsaW5lQ291bnRGb3IoZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93 PigqY2hpbGQpKSk7CiAgICAgfQogCiAgICAgLy8gR2V0IHRoZSBudW1iZXIgb2YgbGluZXMgYW5k IHRoZW4gYWx0ZXIgYWxsIGJsb2NrIGZsb3cgY2hpbGRyZW4gd2l0aCBhdXRvIGhlaWdodCB0byB1 c2UgdGhlCkBAIC0xMDMwLDcgKzEwNDcsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbAogICAg ICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgUmVuZGVyQmxvY2tGbG93JiBibG9ja0NoaWxk ID0gZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PigqY2hpbGQpOwotICAgICAgICBpbnQgbGluZUNv dW50ID0gYmxvY2tDaGlsZC5saW5lQ291bnQoKTsKKyAgICAgICAgaW50IGxpbmVDb3VudCA9IGxp bmVDb3VudEZvcihibG9ja0NoaWxkKTsKICAgICAgICAgaWYgKGxpbmVDb3VudCA8PSBudW1WaXNp YmxlTGluZXMpCiAgICAgICAgICAgICBjb250aW51ZTsKIAo= 457163 2022-04-09 07:08:40 -0700 2022-04-09 09:23:19 -0700 Patch bug-239029-20220409070839.patch text/plain 4909 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThlMTYwNjQ5MzlmMGZl ZjQ3NTdjNGY0MGJmMTdiODM1ZDQwMjg0Yi4uZjJkY2YzNzJhMmM0YzZlOWE5MzRiOTIwMDRkYWJh NDBlNGMzZWM2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA0LTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5lIGNsYW1wIHNwZWNpZmlj IGxpbmUtY291bnQgY29kZSBzaG91bGQgYmUgaW4gUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkwMjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3Zpbmcg dGhlIGxpbmUtY2xhbXAgc3BlY2lmaWMgY29kZSB0byBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3ggZW5hYmxlcyB1cyB0bworICAgICAgICBtYWtlIFJlbmRlckJsb2NrRmxvdzo6bGluZUNvdW50 ICJjaGlsZHJlbiBpbmxpbmUiIG9ubHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxpbmVDb3VudEZvcik6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGlu ZUNsYW1wKToKKwogMjAyMi0wNC0wOCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTiAoU2FmYXJpIDE1LjQpOiBGb2N1c2VkIGVsZW1lbnQgZG9lc24n dCByZW5kZXIgb3V0bGluZSB3aGVuIGl0IGhhcyBhbiB1bmRlcmxpbmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggMjE3N2NiMjE3ZjgzYjk4ZjA5 ZTg2ZTc5Yjk3ZDIyYzhmOWE0NmMxMi4uNDgwNWE5MTE3ZmY4YmMwMDNkNGU1MzhmN2JhMTMzMjVl NTFlNjU4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAKQEAgLTMyMzIsMjkgKzMyMzIsMTkgQEAgYm9vbCBzaG91bGRJbmNsdWRlTGluZXNGb3JQYXJl bnRMaW5lQ291bnQoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3cpCiAKIGludCBSZW5k ZXJCbG9ja0Zsb3c6OmxpbmVDb3VudCgpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hv dWxkIGJlIHRlc3RlZCBieSBjbGllbnRzLgotICAgIGlmIChzdHlsZSgpLnZpc2liaWxpdHkoKSAh PSBWaXNpYmlsaXR5OjpWaXNpYmxlKQorICAgIGlmICghY2hpbGRyZW5JbmxpbmUoKSkgeworICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBpZiAo Y2hpbGRyZW5JbmxpbmUoKSkgeworICAgIH0KICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdf Q09OVEVYVCkKLSAgICAgICAgaWYgKG1vZGVybkxpbmVMYXlvdXQoKSkKLSAgICAgICAgICAgIHJl dHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOworICAgIGlmIChtb2Rlcm5MaW5l TGF5b3V0KCkpCisgICAgICAgIHJldHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgp OwogI2VuZGlmCi0gICAgICAgIGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCi0gICAgICAgICAgICBy ZXR1cm4gbGVnYWN5TGluZUxheW91dCgpLT5saW5lQ291bnQoKTsKLQotICAgICAgICByZXR1cm4g MDsKLSAgICB9Ci0KLSAgICBpbnQgY291bnQgPSAwOwotICAgIGZvciAoYXV0byYgYmxvY2tGbG93 IDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyQmxvY2tGbG93PigqdGhpcykpIHsKLSAgICAgICAgaWYg KCFzaG91bGRJbmNsdWRlTGluZXNGb3JQYXJlbnRMaW5lQ291bnQoYmxvY2tGbG93KSkKLSAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICBjb3VudCArPSBibG9ja0Zsb3cubGluZUNvdW50KCk7 Ci0gICAgfQorICAgIGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCisgICAgICAgIHJldHVybiBsZWdh Y3lMaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOwogCi0gICAgcmV0dXJuIGNvdW50OworICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiAwOwogfQogCiB2b2lkIFJlbmRlckJsb2Nr Rmxvdzo6Y2xlYXJUcnVuY2F0aW9uKCkKQEAgLTM1NTMsMTIgKzM1NDMsMTAgQEAgYm9vbCBSZW5k ZXJCbG9ja0Zsb3c6Omhhc0xpbmVzKCkgY29uc3QKICAgICBpZiAoIWNoaWxkcmVuSW5saW5lKCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19D T05URVhUKQotICAgIGlmIChtb2Rlcm5MaW5lTGF5b3V0KCkpCi0gICAgICAgIHJldHVybiBtb2Rl cm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOwotI2VuZGlmCisgICBpZiAoc3R5bGUoKS52aXNp YmlsaXR5KCkgIT0gVmlzaWJpbGl0eTo6VmlzaWJsZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgcmV0dXJuIGxlZ2FjeUxpbmVMYXlvdXQoKSAmJiBsZWdhY3lMaW5lTGF5b3V0KCktPmxp bmVCb3hlcygpLmZpcnN0TGluZUJveCgpOworICAgIHJldHVybiBsaW5lQ291bnQoKTsKIH0KIAog dm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmludmFsaWRhdGVMaW5lTGF5b3V0UGF0aCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3guY3BwCmluZGV4IGEwNmU1ZjNiYTc2NDg3NWRkNjdmNzEwNjA3NzI5NDY0Yzc0MTI4MmEuLjJk OThhOTczYzRmODAwOTJkNTRiZmQ0ZGIzODFhNjI0MzkzM2JhOTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3Bw CkBAIC05OTUsNiArOTk1LDIzIEBAIHN0YXRpYyBpbnQgaGVpZ2h0Rm9yTGluZUNvdW50KGNvbnN0 IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgaW50IGxpbmVDb3VudCkKICAgICByZXR1cm4gZ2V0SGVp Z2h0Rm9yTGluZUNvdW50KGZsb3csIGxpbmVDb3VudCwgdHJ1ZSwgY291bnQpOwogfQogCitzdGF0 aWMgc2l6ZV90IGxpbmVDb3VudEZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGJsb2NrRmxvdykK K3sKKyAgICBpZiAoYmxvY2tGbG93LnN0eWxlKCkudmlzaWJpbGl0eSgpICE9IFZpc2liaWxpdHk6 OlZpc2libGUpCisgICAgICAgIHJldHVybiAwOworCisgICAgaWYgKGJsb2NrRmxvdy5jaGlsZHJl bklubGluZSgpKQorICAgICAgICByZXR1cm4gYmxvY2tGbG93LmxpbmVDb3VudCgpOworCisgICAg c2l6ZV90IGNvdW50ID0gMDsKKyAgICBmb3IgKGF1dG8mIGNoaWxkIDogY2hpbGRyZW5PZlR5cGU8 UmVuZGVyQmxvY2tGbG93PihibG9ja0Zsb3cpKSB7CisgICAgICAgIGlmIChibG9ja0Zsb3cuaXNG bG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFibG9ja0Zsb3cuc3R5bGUoKS5oZWln aHQoKS5pc0F1dG8oKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBjb3VudCArPSBs aW5lQ291bnRGb3IoY2hpbGQpOworICAgIH0KKyAgICByZXR1cm4gY291bnQ7Cit9CisKIHZvaWQg UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0 b3ImIGl0ZXJhdG9yLCBib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiB7CiAgICAgaW50IG1heExpbmVD b3VudCA9IDA7CkBAIC0xMDE1LDcgKzEwMzIsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4 aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbAog ICAgICAgICB9CiAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICBpZiAo Y2hpbGQtPnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgJiYgaXM8UmVuZGVyQmxvY2tGbG93Pigq Y2hpbGQpKQotICAgICAgICAgICAgbWF4TGluZUNvdW50ID0gc3RkOjptYXgobWF4TGluZUNvdW50 LCBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZCkubGluZUNvdW50KCkpOworICAgICAg ICAgICAgbWF4TGluZUNvdW50ID0gc3RkOjptYXg8aW50PihtYXhMaW5lQ291bnQsIGxpbmVDb3Vu dEZvcihkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZCkpKTsKICAgICB9CiAKICAgICAv LyBHZXQgdGhlIG51bWJlciBvZiBsaW5lcyBhbmQgdGhlbiBhbHRlciBhbGwgYmxvY2sgZmxvdyBj aGlsZHJlbiB3aXRoIGF1dG8gaGVpZ2h0IHRvIHVzZSB0aGUKQEAgLTEwMzAsNyArMTA0Nyw3IEBA IHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94 SXRlcmF0b3ImIGl0ZXJhdG9yLCBib29sCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAg ICBSZW5kZXJCbG9ja0Zsb3cmIGJsb2NrQ2hpbGQgPSBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+ KCpjaGlsZCk7Ci0gICAgICAgIGludCBsaW5lQ291bnQgPSBibG9ja0NoaWxkLmxpbmVDb3VudCgp OworICAgICAgICBpbnQgbGluZUNvdW50ID0gbGluZUNvdW50Rm9yKGJsb2NrQ2hpbGQpOwogICAg ICAgICBpZiAobGluZUNvdW50IDw9IG51bVZpc2libGVMaW5lcykKICAgICAgICAgICAgIGNvbnRp bnVlOwogCg== 457167 2022-04-09 09:23:21 -0700 2022-04-09 22:08:45 -0700 Patch bug-239029-20220409092320.patch text/plain 4932 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThlMTYwNjQ5MzlmMGZl ZjQ3NTdjNGY0MGJmMTdiODM1ZDQwMjg0Yi4uMDc4M2I5YjQwMGEzMDJmOWYwYTQ0MjI4N2E1NjBh ZWY5ZGIxMzU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA0LTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5lIGNsYW1wIHNwZWNpZmlj IGxpbmUtY291bnQgY29kZSBzaG91bGQgYmUgaW4gUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkwMjkK KworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBNb3Zpbmcg dGhlIGxpbmUtY2xhbXAgc3BlY2lmaWMgY29kZSB0byBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3ggZW5hYmxlcyB1cyB0bworICAgICAgICBtYWtlIFJlbmRlckJsb2NrRmxvdzo6bGluZUNvdW50 ICJjaGlsZHJlbiBpbmxpbmUiIG9ubHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxpbmVDb3VudEZvcik6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGlu ZUNsYW1wKToKKwogMjAyMi0wNC0wOCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTiAoU2FmYXJpIDE1LjQpOiBGb2N1c2VkIGVsZW1lbnQgZG9lc24n dCByZW5kZXIgb3V0bGluZSB3aGVuIGl0IGhhcyBhbiB1bmRlcmxpbmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggMjE3N2NiMjE3ZjgzYjk4ZjA5 ZTg2ZTc5Yjk3ZDIyYzhmOWE0NmMxMi4uZWYzNDUwYWZkZjk4NjJmMGQxYmZmZmRhODVjOWM2MzIx YWMyNGE3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAKQEAgLTMyMzIsMjkgKzMyMzIsMTggQEAgYm9vbCBzaG91bGRJbmNsdWRlTGluZXNGb3JQYXJl bnRMaW5lQ291bnQoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3cpCiAKIGludCBSZW5k ZXJCbG9ja0Zsb3c6OmxpbmVDb3VudCgpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hv dWxkIGJlIHRlc3RlZCBieSBjbGllbnRzLgotICAgIGlmIChzdHlsZSgpLnZpc2liaWxpdHkoKSAh PSBWaXNpYmlsaXR5OjpWaXNpYmxlKQorICAgIGlmICghY2hpbGRyZW5JbmxpbmUoKSkgeworICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBpZiAo Y2hpbGRyZW5JbmxpbmUoKSkgeworICAgIH0KICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdf Q09OVEVYVCkKLSAgICAgICAgaWYgKG1vZGVybkxpbmVMYXlvdXQoKSkKLSAgICAgICAgICAgIHJl dHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOworICAgIGlmIChtb2Rlcm5MaW5l TGF5b3V0KCkpCisgICAgICAgIHJldHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgp OwogI2VuZGlmCi0gICAgICAgIGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCi0gICAgICAgICAgICBy ZXR1cm4gbGVnYWN5TGluZUxheW91dCgpLT5saW5lQ291bnQoKTsKLQotICAgICAgICByZXR1cm4g MDsKLSAgICB9Ci0KLSAgICBpbnQgY291bnQgPSAwOwotICAgIGZvciAoYXV0byYgYmxvY2tGbG93 IDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyQmxvY2tGbG93PigqdGhpcykpIHsKLSAgICAgICAgaWYg KCFzaG91bGRJbmNsdWRlTGluZXNGb3JQYXJlbnRMaW5lQ291bnQoYmxvY2tGbG93KSkKLSAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICBjb3VudCArPSBibG9ja0Zsb3cubGluZUNvdW50KCk7 Ci0gICAgfQorICAgIGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCisgICAgICAgIHJldHVybiBsZWdh Y3lMaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOwogCi0gICAgcmV0dXJuIGNvdW50OworICAgIHJl dHVybiAwOwogfQogCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y2xlYXJUcnVuY2F0aW9uKCkKQEAg LTM1NTAsMTUgKzM1MzksOSBAQCBib29sIFJlbmRlckJsb2NrRmxvdzo6cmVsYXlvdXRGb3JQYWdp bmF0aW9uKCkKIAogYm9vbCBSZW5kZXJCbG9ja0Zsb3c6Omhhc0xpbmVzKCkgY29uc3QKIHsKLSAg ICBpZiAoIWNoaWxkcmVuSW5saW5lKCkpCisgICAgaWYgKHN0eWxlKCkudmlzaWJpbGl0eSgpICE9 IFZpc2liaWxpdHk6OlZpc2libGUgfHwgIWNoaWxkcmVuSW5saW5lKCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKLQotI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQotICAgIGlm IChtb2Rlcm5MaW5lTGF5b3V0KCkpCi0gICAgICAgIHJldHVybiBtb2Rlcm5MaW5lTGF5b3V0KCkt PmxpbmVDb3VudCgpOwotI2VuZGlmCi0KLSAgICByZXR1cm4gbGVnYWN5TGluZUxheW91dCgpICYm IGxlZ2FjeUxpbmVMYXlvdXQoKS0+bGluZUJveGVzKCkuZmlyc3RMaW5lQm94KCk7CisgICAgcmV0 dXJuIGxpbmVDb3VudCgpOwogfQogCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6aW52YWxpZGF0ZUxp bmVMYXlvdXRQYXRoKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggYTA2ZTVmM2JhNzY0ODc1ZGQ2N2Y3 MTA2MDc3Mjk0NjRjNzQxMjgyYS4uMmQ5OGE5NzNjNGY4MDA5MmQ1NGJmZDRkYjM4MWE2MjQzOTMz YmE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRl cHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTk5NSw2ICs5OTUsMjMgQEAgc3RhdGljIGludCBo ZWlnaHRGb3JMaW5lQ291bnQoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBpbnQgbGluZUNv dW50KQogICAgIHJldHVybiBnZXRIZWlnaHRGb3JMaW5lQ291bnQoZmxvdywgbGluZUNvdW50LCB0 cnVlLCBjb3VudCk7CiB9CiAKK3N0YXRpYyBzaXplX3QgbGluZUNvdW50Rm9yKGNvbnN0IFJlbmRl ckJsb2NrRmxvdyYgYmxvY2tGbG93KQoreworICAgIGlmIChibG9ja0Zsb3cuc3R5bGUoKS52aXNp YmlsaXR5KCkgIT0gVmlzaWJpbGl0eTo6VmlzaWJsZSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAg ICBpZiAoYmxvY2tGbG93LmNoaWxkcmVuSW5saW5lKCkpCisgICAgICAgIHJldHVybiBibG9ja0Zs b3cubGluZUNvdW50KCk7CisKKyAgICBzaXplX3QgY291bnQgPSAwOworICAgIGZvciAoYXV0byYg Y2hpbGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJCbG9ja0Zsb3c+KGJsb2NrRmxvdykpIHsKKyAg ICAgICAgaWYgKGJsb2NrRmxvdy5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwg IWJsb2NrRmxvdy5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpKQorICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgIGNvdW50ICs9IGxpbmVDb3VudEZvcihjaGlsZCk7CisgICAgfQorICAgIHJl dHVybiBjb3VudDsKK30KKwogdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5 TGluZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wgcmVsYXlvdXRDaGlsZHJl bikKIHsKICAgICBpbnQgbWF4TGluZUNvdW50ID0gMDsKQEAgLTEwMTUsNyArMTAzMiw3IEBAIHZv aWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRl cmF0b3ImIGl0ZXJhdG9yLCBib29sCiAgICAgICAgIH0KICAgICAgICAgY2hpbGQtPmxheW91dElm TmVlZGVkKCk7CiAgICAgICAgIGlmIChjaGlsZC0+c3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSAm JiBpczxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZCkpCi0gICAgICAgICAgICBtYXhMaW5lQ291bnQg PSBzdGQ6Om1heChtYXhMaW5lQ291bnQsIGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKmNoaWxk KS5saW5lQ291bnQoKSk7CisgICAgICAgICAgICBtYXhMaW5lQ291bnQgPSBzdGQ6Om1heDxpbnQ+ KG1heExpbmVDb3VudCwgbGluZUNvdW50Rm9yKGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKmNo aWxkKSkpOwogICAgIH0KIAogICAgIC8vIEdldCB0aGUgbnVtYmVyIG9mIGxpbmVzIGFuZCB0aGVu IGFsdGVyIGFsbCBibG9jayBmbG93IGNoaWxkcmVuIHdpdGggYXV0byBoZWlnaHQgdG8gdXNlIHRo ZQpAQCAtMTAzMCw3ICsxMDQ3LDcgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6 OmFwcGx5TGluZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wKICAgICAgICAg ICAgIGNvbnRpbnVlOwogCiAgICAgICAgIFJlbmRlckJsb2NrRmxvdyYgYmxvY2tDaGlsZCA9IGRv d25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKmNoaWxkKTsKLSAgICAgICAgaW50IGxpbmVDb3VudCA9 IGJsb2NrQ2hpbGQubGluZUNvdW50KCk7CisgICAgICAgIGludCBsaW5lQ291bnQgPSBsaW5lQ291 bnRGb3IoYmxvY2tDaGlsZCk7CiAgICAgICAgIGlmIChsaW5lQ291bnQgPD0gbnVtVmlzaWJsZUxp bmVzKQogICAgICAgICAgICAgY29udGludWU7CiAK 457187 2022-04-09 21:15:08 -0700 2022-04-10 06:59:39 -0700 Patch bug-239029-20220409211507.patch text/plain 4872 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ2ODNlMDc5MWZhMjQ5 NTdmNGJlYTJjN2NmYzMzMDE4ZWQxMWYwOS4uMjNkMzkyNTYxOWVkYmIzN2ViZDYzYjNkMDM4ODE1 NmM1MDZlZjMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA0LTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5lIGNsYW1wIHNwZWNpZmlj IGxpbmUtY291bnQgY29kZSBzaG91bGQgYmUgaW4gUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkwMjkK KworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBNb3Zpbmcg dGhlIGxpbmUtY2xhbXAgc3BlY2lmaWMgY29kZSB0byBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3ggZW5hYmxlcyB1cyB0bworICAgICAgICBtYWtlIFJlbmRlckJsb2NrRmxvdzo6bGluZUNvdW50 ICJjaGlsZHJlbiBpbmxpbmUiIG9ubHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxpbmVDb3VudEZvcik6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGlu ZUNsYW1wKToKKwogMjAyMi0wNC0wOSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1RleHQgYXV0b3NpemluZ10gUmVtb3ZlIHJlZHVuZGFudCBsaW5lQ291bnRGb3JU ZXh0QXV0b3NpemluZyBtZW1iZXIgZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggNmFmODk2MjQwZDQwNDA3N2Y2OTU2MGNiZTQ5OTZm NzllMzc1M2MxYy4uNDYxZjY5OTlmNGExMTgyYzI4ZTNmNTVhYzEwYTEwNmRmNTc1YzhjOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTMyMzIs MjkgKzMyMzIsMTggQEAgYm9vbCBzaG91bGRJbmNsdWRlTGluZXNGb3JQYXJlbnRMaW5lQ291bnQo Y29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3cpCiAKIGludCBSZW5kZXJCbG9ja0Zsb3c6 OmxpbmVDb3VudCgpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIHRlc3Rl ZCBieSBjbGllbnRzLgotICAgIGlmIChzdHlsZSgpLnZpc2liaWxpdHkoKSAhPSBWaXNpYmlsaXR5 OjpWaXNpYmxlKQorICAgIGlmICghY2hpbGRyZW5JbmxpbmUoKSkgeworICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBpZiAoY2hpbGRyZW5Jbmxp bmUoKSkgeworICAgIH0KICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAg ICAgICAgaWYgKG1vZGVybkxpbmVMYXlvdXQoKSkKLSAgICAgICAgICAgIHJldHVybiBtb2Rlcm5M aW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOworICAgIGlmIChtb2Rlcm5MaW5lTGF5b3V0KCkpCisg ICAgICAgIHJldHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOwogI2VuZGlmCi0g ICAgICAgIGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCi0gICAgICAgICAgICByZXR1cm4gbGVnYWN5 TGluZUxheW91dCgpLT5saW5lQ291bnQoKTsKLQotICAgICAgICByZXR1cm4gMDsKLSAgICB9Ci0K LSAgICBpbnQgY291bnQgPSAwOwotICAgIGZvciAoYXV0byYgYmxvY2tGbG93IDogY2hpbGRyZW5P ZlR5cGU8UmVuZGVyQmxvY2tGbG93PigqdGhpcykpIHsKLSAgICAgICAgaWYgKCFzaG91bGRJbmNs dWRlTGluZXNGb3JQYXJlbnRMaW5lQ291bnQoYmxvY2tGbG93KSkKLSAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICBjb3VudCArPSBibG9ja0Zsb3cubGluZUNvdW50KCk7Ci0gICAgfQorICAg IGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCisgICAgICAgIHJldHVybiBsZWdhY3lMaW5lTGF5b3V0 KCktPmxpbmVDb3VudCgpOwogCi0gICAgcmV0dXJuIGNvdW50OworICAgIHJldHVybiAwOwogfQog CiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y2xlYXJUcnVuY2F0aW9uKCkKQEAgLTM1NTAsMTUgKzM1 MzksNyBAQCBib29sIFJlbmRlckJsb2NrRmxvdzo6cmVsYXlvdXRGb3JQYWdpbmF0aW9uKCkKIAog Ym9vbCBSZW5kZXJCbG9ja0Zsb3c6Omhhc0xpbmVzKCkgY29uc3QKIHsKLSAgICBpZiAoIWNoaWxk cmVuSW5saW5lKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotI2lmIEVOQUJMRShMQVlPVVRf Rk9STUFUVElOR19DT05URVhUKQotICAgIGlmIChtb2Rlcm5MaW5lTGF5b3V0KCkpCi0gICAgICAg IHJldHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOwotI2VuZGlmCi0KLSAgICBy ZXR1cm4gbGVnYWN5TGluZUxheW91dCgpICYmIGxlZ2FjeUxpbmVMYXlvdXQoKS0+bGluZUJveGVz KCkuZmlyc3RMaW5lQm94KCk7CisgICAgcmV0dXJuIGNoaWxkcmVuSW5saW5lKCkgPyBsaW5lQ291 bnQoKSA6IGZhbHNlOwogfQogCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6aW52YWxpZGF0ZUxpbmVM YXlvdXRQYXRoKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJE ZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggYTA2ZTVmM2JhNzY0ODc1ZGQ2N2Y3MTA2 MDc3Mjk0NjRjNzQxMjgyYS4uMmQ5OGE5NzNjNGY4MDA5MmQ1NGJmZDRkYjM4MWE2MjQzOTMzYmE5 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRG bGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTk5NSw2ICs5OTUsMjMgQEAgc3RhdGljIGludCBoZWln aHRGb3JMaW5lQ291bnQoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBpbnQgbGluZUNvdW50 KQogICAgIHJldHVybiBnZXRIZWlnaHRGb3JMaW5lQ291bnQoZmxvdywgbGluZUNvdW50LCB0cnVl LCBjb3VudCk7CiB9CiAKK3N0YXRpYyBzaXplX3QgbGluZUNvdW50Rm9yKGNvbnN0IFJlbmRlckJs b2NrRmxvdyYgYmxvY2tGbG93KQoreworICAgIGlmIChibG9ja0Zsb3cuc3R5bGUoKS52aXNpYmls aXR5KCkgIT0gVmlzaWJpbGl0eTo6VmlzaWJsZSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBp ZiAoYmxvY2tGbG93LmNoaWxkcmVuSW5saW5lKCkpCisgICAgICAgIHJldHVybiBibG9ja0Zsb3cu bGluZUNvdW50KCk7CisKKyAgICBzaXplX3QgY291bnQgPSAwOworICAgIGZvciAoYXV0byYgY2hp bGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJCbG9ja0Zsb3c+KGJsb2NrRmxvdykpIHsKKyAgICAg ICAgaWYgKGJsb2NrRmxvdy5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIWJs b2NrRmxvdy5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpKQorICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIGNvdW50ICs9IGxpbmVDb3VudEZvcihjaGlsZCk7CisgICAgfQorICAgIHJldHVy biBjb3VudDsKK30KKwogdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGlu ZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wgcmVsYXlvdXRDaGlsZHJlbikK IHsKICAgICBpbnQgbWF4TGluZUNvdW50ID0gMDsKQEAgLTEwMTUsNyArMTAzMiw3IEBAIHZvaWQg UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0 b3ImIGl0ZXJhdG9yLCBib29sCiAgICAgICAgIH0KICAgICAgICAgY2hpbGQtPmxheW91dElmTmVl ZGVkKCk7CiAgICAgICAgIGlmIChjaGlsZC0+c3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSAmJiBp czxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZCkpCi0gICAgICAgICAgICBtYXhMaW5lQ291bnQgPSBz dGQ6Om1heChtYXhMaW5lQ291bnQsIGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKmNoaWxkKS5s aW5lQ291bnQoKSk7CisgICAgICAgICAgICBtYXhMaW5lQ291bnQgPSBzdGQ6Om1heDxpbnQ+KG1h eExpbmVDb3VudCwgbGluZUNvdW50Rm9yKGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKmNoaWxk KSkpOwogICAgIH0KIAogICAgIC8vIEdldCB0aGUgbnVtYmVyIG9mIGxpbmVzIGFuZCB0aGVuIGFs dGVyIGFsbCBibG9jayBmbG93IGNoaWxkcmVuIHdpdGggYXV0byBoZWlnaHQgdG8gdXNlIHRoZQpA QCAtMTAzMCw3ICsxMDQ3LDcgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFw cGx5TGluZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wKICAgICAgICAgICAg IGNvbnRpbnVlOwogCiAgICAgICAgIFJlbmRlckJsb2NrRmxvdyYgYmxvY2tDaGlsZCA9IGRvd25j YXN0PFJlbmRlckJsb2NrRmxvdz4oKmNoaWxkKTsKLSAgICAgICAgaW50IGxpbmVDb3VudCA9IGJs b2NrQ2hpbGQubGluZUNvdW50KCk7CisgICAgICAgIGludCBsaW5lQ291bnQgPSBsaW5lQ291bnRG b3IoYmxvY2tDaGlsZCk7CiAgICAgICAgIGlmIChsaW5lQ291bnQgPD0gbnVtVmlzaWJsZUxpbmVz KQogICAgICAgICAgICAgY29udGludWU7CiAK 457199 2022-04-10 06:59:41 -0700 2022-04-10 14:57:32 -0700 Patch bug-239029-20220410065940.patch text/plain 5413 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ2ODNlMDc5MWZhMjQ5 NTdmNGJlYTJjN2NmYzMzMDE4ZWQxMWYwOS4uMjNkMzkyNTYxOWVkYmIzN2ViZDYzYjNkMDM4ODE1 NmM1MDZlZjMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA0LTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5lIGNsYW1wIHNwZWNpZmlj IGxpbmUtY291bnQgY29kZSBzaG91bGQgYmUgaW4gUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkwMjkK KworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBNb3Zpbmcg dGhlIGxpbmUtY2xhbXAgc3BlY2lmaWMgY29kZSB0byBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3ggZW5hYmxlcyB1cyB0bworICAgICAgICBtYWtlIFJlbmRlckJsb2NrRmxvdzo6bGluZUNvdW50 ICJjaGlsZHJlbiBpbmxpbmUiIG9ubHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxpbmVDb3VudEZvcik6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGlu ZUNsYW1wKToKKwogMjAyMi0wNC0wOSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1RleHQgYXV0b3NpemluZ10gUmVtb3ZlIHJlZHVuZGFudCBsaW5lQ291bnRGb3JU ZXh0QXV0b3NpemluZyBtZW1iZXIgZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggNmFmODk2MjQwZDQwNDA3N2Y2OTU2MGNiZTQ5OTZm NzllMzc1M2MxYy4uMDczZDVhYTg3ZjgxOGE3YTE2NjM5ZTdlNmRiZDA1OWRiODU4ZDUzMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTMyMzIs MjkgKzMyMzIsMTggQEAgYm9vbCBzaG91bGRJbmNsdWRlTGluZXNGb3JQYXJlbnRMaW5lQ291bnQo Y29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3cpCiAKIGludCBSZW5kZXJCbG9ja0Zsb3c6 OmxpbmVDb3VudCgpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIHRlc3Rl ZCBieSBjbGllbnRzLgotICAgIGlmIChzdHlsZSgpLnZpc2liaWxpdHkoKSAhPSBWaXNpYmlsaXR5 OjpWaXNpYmxlKQorICAgIGlmICghY2hpbGRyZW5JbmxpbmUoKSkgeworICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBpZiAoY2hpbGRyZW5Jbmxp bmUoKSkgeworICAgIH0KICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAg ICAgICAgaWYgKG1vZGVybkxpbmVMYXlvdXQoKSkKLSAgICAgICAgICAgIHJldHVybiBtb2Rlcm5M aW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOworICAgIGlmIChtb2Rlcm5MaW5lTGF5b3V0KCkpCisg ICAgICAgIHJldHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOwogI2VuZGlmCi0g ICAgICAgIGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCi0gICAgICAgICAgICByZXR1cm4gbGVnYWN5 TGluZUxheW91dCgpLT5saW5lQ291bnQoKTsKLQotICAgICAgICByZXR1cm4gMDsKLSAgICB9Ci0K LSAgICBpbnQgY291bnQgPSAwOwotICAgIGZvciAoYXV0byYgYmxvY2tGbG93IDogY2hpbGRyZW5P ZlR5cGU8UmVuZGVyQmxvY2tGbG93PigqdGhpcykpIHsKLSAgICAgICAgaWYgKCFzaG91bGRJbmNs dWRlTGluZXNGb3JQYXJlbnRMaW5lQ291bnQoYmxvY2tGbG93KSkKLSAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICBjb3VudCArPSBibG9ja0Zsb3cubGluZUNvdW50KCk7Ci0gICAgfQorICAg IGlmIChsZWdhY3lMaW5lTGF5b3V0KCkpCisgICAgICAgIHJldHVybiBsZWdhY3lMaW5lTGF5b3V0 KCktPmxpbmVDb3VudCgpOwogCi0gICAgcmV0dXJuIGNvdW50OworICAgIHJldHVybiAwOwogfQog CiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y2xlYXJUcnVuY2F0aW9uKCkKQEAgLTM1NTAsMTUgKzM1 MzksNyBAQCBib29sIFJlbmRlckJsb2NrRmxvdzo6cmVsYXlvdXRGb3JQYWdpbmF0aW9uKCkKIAog Ym9vbCBSZW5kZXJCbG9ja0Zsb3c6Omhhc0xpbmVzKCkgY29uc3QKIHsKLSAgICBpZiAoIWNoaWxk cmVuSW5saW5lKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotI2lmIEVOQUJMRShMQVlPVVRf Rk9STUFUVElOR19DT05URVhUKQotICAgIGlmIChtb2Rlcm5MaW5lTGF5b3V0KCkpCi0gICAgICAg IHJldHVybiBtb2Rlcm5MaW5lTGF5b3V0KCktPmxpbmVDb3VudCgpOwotI2VuZGlmCi0KLSAgICBy ZXR1cm4gbGVnYWN5TGluZUxheW91dCgpICYmIGxlZ2FjeUxpbmVMYXlvdXQoKS0+bGluZUJveGVz KCkuZmlyc3RMaW5lQm94KCk7CisgICAgcmV0dXJuIGNoaWxkcmVuSW5saW5lKCkgPyBsaW5lQ291 bnQoKSA6IGZhbHNlOwogfQogCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6aW52YWxpZGF0ZUxpbmVM YXlvdXRQYXRoKCkKQEAgLTM4MTIsNiArMzc5Myw4IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojph ZGp1c3RDb21wdXRlZEZvbnRTaXplcyhmbG9hdCBzaXplLCBmbG9hdCB2aXNpYmxlV2lkdGgpCiAg ICAgICAgICAgICAgICAgbGluZUNvdW50SW5CbG9jayA9IHRoaXMtPmxpbmVDb3VudCgpOwogICAg ICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgZm9yIChhdXRvJiBsaXN0SXRlbSA6IGNo aWxkcmVuT2ZUeXBlPFJlbmRlckxpc3RJdGVtPigqdGhpcykpIHsKKyAgICAgICAgICAgICAgICAg ICAgaWYgKCFsaXN0SXRlbS5jaGlsZHJlbklubGluZSgpIHx8IGxpc3RJdGVtLnN0eWxlKCkudmlz aWJpbGl0eSgpICE9IFZpc2liaWxpdHk6OlZpc2libGUpCisgICAgICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgICAgICAgICAgbGluZUNvdW50SW5CbG9jayArPSBsaXN0 SXRlbS5saW5lQ291bnQoKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGxpbmVDb3VudEluQmxv Y2sgPiAxKQogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCmlu ZGV4IGEwNmU1ZjNiYTc2NDg3NWRkNjdmNzEwNjA3NzI5NDY0Yzc0MTI4MmEuLjJkOThhOTczYzRm ODAwOTJkNTRiZmQ0ZGIzODFhNjI0MzkzM2JhOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCkBAIC05OTUs NiArOTk1LDIzIEBAIHN0YXRpYyBpbnQgaGVpZ2h0Rm9yTGluZUNvdW50KGNvbnN0IFJlbmRlckJs b2NrRmxvdyYgZmxvdywgaW50IGxpbmVDb3VudCkKICAgICByZXR1cm4gZ2V0SGVpZ2h0Rm9yTGlu ZUNvdW50KGZsb3csIGxpbmVDb3VudCwgdHJ1ZSwgY291bnQpOwogfQogCitzdGF0aWMgc2l6ZV90 IGxpbmVDb3VudEZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGJsb2NrRmxvdykKK3sKKyAgICBp ZiAoYmxvY2tGbG93LnN0eWxlKCkudmlzaWJpbGl0eSgpICE9IFZpc2liaWxpdHk6OlZpc2libGUp CisgICAgICAgIHJldHVybiAwOworCisgICAgaWYgKGJsb2NrRmxvdy5jaGlsZHJlbklubGluZSgp KQorICAgICAgICByZXR1cm4gYmxvY2tGbG93LmxpbmVDb3VudCgpOworCisgICAgc2l6ZV90IGNv dW50ID0gMDsKKyAgICBmb3IgKGF1dG8mIGNoaWxkIDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyQmxv Y2tGbG93PihibG9ja0Zsb3cpKSB7CisgICAgICAgIGlmIChibG9ja0Zsb3cuaXNGbG9hdGluZ09y T3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFibG9ja0Zsb3cuc3R5bGUoKS5oZWlnaHQoKS5pc0F1 dG8oKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBjb3VudCArPSBsaW5lQ291bnRG b3IoY2hpbGQpOworICAgIH0KKyAgICByZXR1cm4gY291bnQ7Cit9CisKIHZvaWQgUmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3ImIGl0ZXJh dG9yLCBib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiB7CiAgICAgaW50IG1heExpbmVDb3VudCA9IDA7 CkBAIC0xMDE1LDcgKzEwMzIsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6 YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbAogICAgICAgICB9 CiAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICBpZiAoY2hpbGQtPnN0 eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgJiYgaXM8UmVuZGVyQmxvY2tGbG93PigqY2hpbGQpKQot ICAgICAgICAgICAgbWF4TGluZUNvdW50ID0gc3RkOjptYXgobWF4TGluZUNvdW50LCBkb3duY2Fz dDxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZCkubGluZUNvdW50KCkpOworICAgICAgICAgICAgbWF4 TGluZUNvdW50ID0gc3RkOjptYXg8aW50PihtYXhMaW5lQ291bnQsIGxpbmVDb3VudEZvcihkb3du Y2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZCkpKTsKICAgICB9CiAKICAgICAvLyBHZXQgdGhl IG51bWJlciBvZiBsaW5lcyBhbmQgdGhlbiBhbHRlciBhbGwgYmxvY2sgZmxvdyBjaGlsZHJlbiB3 aXRoIGF1dG8gaGVpZ2h0IHRvIHVzZSB0aGUKQEAgLTEwMzAsNyArMTA0Nyw3IEBAIHZvaWQgUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3Im IGl0ZXJhdG9yLCBib29sCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBSZW5kZXJC bG9ja0Zsb3cmIGJsb2NrQ2hpbGQgPSBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZCk7 Ci0gICAgICAgIGludCBsaW5lQ291bnQgPSBibG9ja0NoaWxkLmxpbmVDb3VudCgpOworICAgICAg ICBpbnQgbGluZUNvdW50ID0gbGluZUNvdW50Rm9yKGJsb2NrQ2hpbGQpOwogICAgICAgICBpZiAo bGluZUNvdW50IDw9IG51bVZpc2libGVMaW5lcykKICAgICAgICAgICAgIGNvbnRpbnVlOwogCg==