261452 2023-09-11 19:39:52 -0700 [IFC] fast/canvas/imageData-consistency.html is a flaky timeout in debug 2023-09-12 11:53:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=261365 InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1976995 0 zalan 2023-09-11 19:39:52 -0700 ssia 1976998 1 467654 zalan 2023-09-11 19:50:54 -0700 Created attachment 467654 Patch 1977063 2 467664 zalan 2023-09-12 08:30:43 -0700 Created attachment 467664 Patch 1977100 3 ews-feeder 2023-09-12 11:52:11 -0700 Committed 267910@main (b1f1e04f4d8d): <https://commits.webkit.org/267910@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467664. 1977101 4 webkit-bug-importer 2023-09-12 11:53:14 -0700 <rdar://problem/115376103> 467654 2023-09-11 19:50:54 -0700 2023-09-12 08:30:41 -0700 Patch bug-261452-20230911195054.patch text/plain 9557 zalan RnJvbSAyNzFjNmFiYzEwYjk3NzFjNGYzOWFhYWFhYjFiNTI0OTFjMThiYjBjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMTEgU2VwIDIwMjMgMTk6NDA6MTAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBm YXN0L2NhbnZhcy9pbWFnZURhdGEtY29uc2lzdGVuY3kuaHRtbCBpcyBhIGZsYWt5CiB0aW1lb3V0 IGluIGRlYnVnIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjE0NTIK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKZmFzdC9jYW52YXMvaW1hZ2VEYXRhLWNvbnNp c3RlbmN5Lmh0bWwgcHJvZHVjZXMgb3ZlciAzMEsgYm94ZXMgYnkgYXBwZW5kaW5nIG11bHRpcGxl CmJveGVzIGF0IGEgdGltZSBmb2xsb3dlZCBieSBhIGZvcmNlZCBsYXlvdXQuCkNhbGxpbmcgTGlu ZUxheW91dDo6Y29udGVudE5lZWRzVmlzdWFsUmVvcmRlcmluZyBpbiBkZWJ1ZyBtb2RlIG9uIHN1 Y2ggYW4gZXh0ZW5kZWQgY29udGVudCBpcyBjb3N0bHkuCgpUaGlzIHBhdGNoIGNhY2hlcyB0aGUg ImNvbnRlbnQgbmVlZHMgdmlzdWFsIHJlb3JkZXJpbmciIGJpdCBkdXJpbmcgaW5saW5lIGl0ZW1z IGJ1aWxkaW5nIHNvIHRoYXQKd2UgZG9uJ3QgaGF2ZSB0byB0cmF2ZXJzZSB0aGUgY29udGVudCBh dCBpbnZhbGlkYXRpb24gdGltZSB0byBzZWUgaWYgaXQgaXMgZWxpZ2libGUgZm9yIHBhcnRpYWwg bGF5b3V0LgoKSW50cm9kdWNpbmcgdGhpcyBiaXQgYWxzbyBoZWxwcyB3aXRoIHRoZSB1cGNvbWlu ZyBiaWRpIGNvbnRlbnQgaW52YWxpZGF0aW9uLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaDoKKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlOjpzZXRDb250ZW50UmVxdWlyZXNWaXN1YWxS ZW9yZGVyaW5nKToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlOjpjb250 ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nIGNvbnN0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgooV2Vi Q29yZTo6TGF5b3V0OjpyZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcpOgooV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVJdGVtc0J1aWxkZXI6OnRyYXZlcnNlVW50aWxEYW1hZ2VkKToKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjppbml0aWFsaXplTGF5b3V0UXVldWUpOiByZW1vdmUg cmVkdW5kYW50IGNoZWNrLiB0cmF2ZXJzZVVudGlsRGFtYWdlZCB0YWtlcyBjYXJlIG9mIHRoZSBm aXJzdCBjaGlsZC4KKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpjb2xsZWN0 SW5saW5lSXRlbXMpOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRs ZVRleHRDb250ZW50KToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpoYW5k bGVJbmxpbmVCb3hTdGFydCk6CihXZWJDb3JlOjpMYXlvdXQ6OmlzTm9uQmlkaVRleHRPckZvcmNl ZExpbmVCcmVhayk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OmNvbnRlbnROZWVkc1Zpc3VhbFJlb3JkZXJpbmcgY29u c3QpOgotLS0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmggICAgICAgICAgICB8 ICA0ICsrKysKIC4uLi9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCAgICAgICAgICAgICB8 IDIyICsrKysrKysrKy0tLS0tLS0tLS0KIC4uLi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5l TGF5b3V0LmNwcCAgICB8IDE1ICstLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTYgaW5z ZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVG b3JtYXR0aW5nU3RhdGUuaAppbmRleCAyOGM3YjJlNTk2YTEuLjM1MTU2MzVjZDgyYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRm9ybWF0dGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKQEAgLTQ4LDYgKzQ4LDkg QEAgcHVibGljOgogICAgIHZvaWQgc2V0SW5saW5lSXRlbXMoSW5saW5lSXRlbXMmJiBpbmxpbmVJ dGVtcykgeyBtX2lubGluZUl0ZW1zID0gV1RGTW92ZShpbmxpbmVJdGVtcyk7IH0KICAgICB2b2lk IGFwcGVuZElubGluZUl0ZW1zKElubGluZUl0ZW1zJiYgaW5saW5lSXRlbXMpIHsgbV9pbmxpbmVJ dGVtcy5hcHBlbmRWZWN0b3IoV1RGTW92ZShpbmxpbmVJdGVtcykpOyB9CiAKKyAgICB2b2lkIHNl dENvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcoYm9vbCBjb250ZW50UmVxdWlyZXNWaXN1 YWxSZW9yZGVyaW5nKSB7IG1fY29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZyA9IGNvbnRl bnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmc7IH0KKyAgICBib29sIGNvbnRlbnRSZXF1aXJlc1Zp c3VhbFJlb3JkZXJpbmcoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJl b3JkZXJpbmc7IH0KKwogICAgIHZvaWQgc2V0SXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVh a09ubHlDb250ZW50KGJvb2wgaXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250 ZW50KSB7IG1faXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250ZW50ID0gaXNO b25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250ZW50OyB9CiAgICAgYm9vbCBpc05v bkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFrT25seUNvbnRlbnQoKSBjb25zdCB7IHJldHVybiBt X2lzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5Q29udGVudDsgfQogCkBAIC02MSw2 ICs2NCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSW5saW5lSXRlbXMgbV9pbmxpbmVJdGVt czsKICAgICBzdGQ6Om9wdGlvbmFsPEludHJpbnNpY1dpZHRoSGFuZGxlcjo6TGluZUJyZWFraW5n UmVzdWx0PiBtX21heGltdW1JbnRyaW5zaWNXaWR0aExheW91dFJlc3VsdCB7IH07CisgICAgYm9v bCBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcgeyBmYWxzZSB9OwogICAgIGJvb2wg bV9pc05vbkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFrT25seUNvbnRlbnQgeyBmYWxzZSB9Owog fTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKaW5kZXggZTcw MzBmZGRiMmJiLi5iOWYxYjc3MDA2NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bXNCdWlsZGVyLmNwcApAQCAtMTI4LDE1ICsxMjgsMTUgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxk ZXI6OmJ1aWxkKElubGluZUl0ZW1Qb3NpdGlvbiBzdGFydFBvc2l0aW9uKQogI2VuZGlmCiB9CiAK LXN0YXRpYyBib29sIGlzTm9uQmlkaVRleHRPckZvcmNlZExpbmVCcmVhayhjb25zdCBCb3gmIGxh eW91dEJveCkKK3N0YXRpYyBib29sIHJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZyhjb25zdCBCb3gm IGxheW91dEJveCkKIHsKLSAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5pc0lubGluZUJveCgp ID8gbGF5b3V0Qm94LnN0eWxlKCkgOiBsYXlvdXRCb3gucGFyZW50KCkuc3R5bGUoKTsKLSAgICBh dXRvIGNvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcgPSAhc3R5bGUuaXNMZWZ0VG9SaWdo dERpcmVjdGlvbigpIHx8IChzdHlsZS5ydGxPcmRlcmluZygpID09IE9yZGVyOjpMb2dpY2FsICYm IHN0eWxlLnVuaWNvZGVCaWRpKCkgIT0gVW5pY29kZUJpZGk6Ok5vcm1hbCk7Ci0gICAgaWYgKGNv bnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcpCi0gICAgICAgIHJldHVybiBmYWxzZTsKICAg ICBpZiAoaXM8SW5saW5lVGV4dEJveD4obGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIFRleHRV dGlsOjpjb250YWluc1N0cm9uZ0RpcmVjdGlvbmFsaXR5VGV4dChkb3duY2FzdDxJbmxpbmVUZXh0 Qm94PihsYXlvdXRCb3gpLmNvbnRlbnQoKSk7Ci0gICAgcmV0dXJuIGxheW91dEJveC5pc0xpbmVC cmVha0JveCgpOworICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCb3goKSAmJiBsYXlvdXRCb3gu aXNJbkZsb3coKSkgeworICAgICAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwor ICAgICAgICByZXR1cm4gIXN0eWxlLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSB8fCAoc3R5bGUu cnRsT3JkZXJpbmcoKSA9PSBPcmRlcjo6TG9naWNhbCAmJiBzdHlsZS51bmljb2RlQmlkaSgpICE9 IFVuaWNvZGVCaWRpOjpOb3JtYWwpOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJv b2wgSW5saW5lSXRlbXNCdWlsZGVyOjp0cmF2ZXJzZVVudGlsRGFtYWdlZChMYXlvdXRRdWV1ZSYg bGF5b3V0UXVldWUsIGNvbnN0IEJveCYgc3VidHJlZVJvb3QsIGNvbnN0IEJveCYgZmlyc3REYW1h Z2VkTGF5b3V0Qm94KQpAQCAtMTQ0LDcgKzE0NCw4IEBAIGJvb2wgSW5saW5lSXRlbXNCdWlsZGVy Ojp0cmF2ZXJzZVVudGlsRGFtYWdlZChMYXlvdXRRdWV1ZSYgbGF5b3V0UXVldWUsIGNvbnN0IEJv CiAgICAgaWYgKCZzdWJ0cmVlUm9vdCA9PSAmZmlyc3REYW1hZ2VkTGF5b3V0Qm94KQogICAgICAg ICByZXR1cm4gdHJ1ZTsKIAotICAgIG1faXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09u bHlDb250ZW50ID0gbV9pc05vbkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFrT25seUNvbnRlbnQg JiYgaXNOb25CaWRpVGV4dE9yRm9yY2VkTGluZUJyZWFrKHN1YnRyZWVSb290KTsKKyAgICBtX2Nv bnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcgPSBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJl b3JkZXJpbmcgfHwgcmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nKHN1YnRyZWVSb290KTsKKyAgICBt X2lzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5Q29udGVudCA9IG1faXNOb25CaWRp VGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250ZW50ICYmICFtX2NvbnRlbnRSZXF1aXJlc1Zp c3VhbFJlb3JkZXJpbmcgJiYgKHN1YnRyZWVSb290LmlzSW5saW5lVGV4dEJveCgpIHx8IHN1YnRy ZWVSb290LmlzTGluZUJyZWFrQm94KCkpOwogCiAgICAgYXV0byBzaG91bGRTa2lwU3VidHJlZSA9 IHN1YnRyZWVSb290LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKTsKICAgICBpZiAoIXNo b3VsZFNraXBTdWJ0cmVlICYmIGlzPEVsZW1lbnRCb3g+KHN1YnRyZWVSb290KSAmJiBkb3duY2Fz dDxFbGVtZW50Qm94PihzdWJ0cmVlUm9vdCkuaGFzQ2hpbGQoKSkgewpAQCAtMTkxLDcgKzE5Miw2 IEBAIElubGluZUl0ZW1zQnVpbGRlcjo6TGF5b3V0UXVldWUgSW5saW5lSXRlbXNCdWlsZGVyOjpp bml0aWFsaXplTGF5b3V0UXVldWUoSW5saW5lCiAKICAgICBhdXRvJiBmaXJzdERhbWFnZWRMYXlv dXRCb3ggPSBleGlzdGluZ0lubGluZUl0ZW1zW3N0YXJ0UG9zaXRpb24uaW5kZXhdLmxheW91dEJv eCgpOwogICAgIGF1dG8mIGZpcnN0Q2hpbGQgPSAqcm9vdC5maXJzdENoaWxkKCk7Ci0gICAgbV9p c05vbkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFrT25seUNvbnRlbnQgPSBtX2lzTm9uQmlkaVRl eHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5Q29udGVudCAmJiBpc05vbkJpZGlUZXh0T3JGb3JjZWRM aW5lQnJlYWsoZmlyc3RDaGlsZCk7CiAgICAgTGF5b3V0UXVldWUgbGF5b3V0UXVldWU7CiAgICAg bGF5b3V0UXVldWUuYXBwZW5kKGZpcnN0Q2hpbGQpOwogICAgIHRyYXZlcnNlVW50aWxEYW1hZ2Vk KGxheW91dFF1ZXVlLCBmaXJzdENoaWxkLCBmaXJzdERhbWFnZWRMYXlvdXRCb3gpOwpAQCAtMjY3 LDYgKzI2Nyw3IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMo SW5saW5lSXRlbXMmIGlubGluZUl0ZW1zLCBJbmxpbmVJdGVtCiAgICAgICAgIH0KICAgICB9CiAg ICAgbV9mb3JtYXR0aW5nU3RhdGUuc2V0SXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09u bHlDb250ZW50KG1faXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250ZW50KTsK KyAgICBtX2Zvcm1hdHRpbmdTdGF0ZS5zZXRDb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5n KG1fY29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZyk7CiB9CiAKIHN0YXRpYyB2b2lkIHJl cGxhY2VOb25QcmVzZXJ2ZWROZXdMaW5lQW5kVGFiQ2hhcmFjdGVyc0FuZEFwcGVuZChjb25zdCBJ bmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBTdHJpbmdCdWlsZGVyJiBwYXJhZ3JhcGhDb250 ZW50QnVpbGRlcikKQEAgLTY1MSw3ICs2NTIsNyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6 aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwgSQog ICAgIGlmIChpbmxpbmVUZXh0Qm94LmlzQ29tYmluZWQoKSkKICAgICAgICAgcmV0dXJuIGlubGlu ZUl0ZW1zLmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oaW5s aW5lVGV4dEJveCwgeyB9LCBjb250ZW50TGVuZ3RoLCBVQklESV9ERUZBVUxUX0xUUiwgZmFsc2Us IHsgfSkpOwogCi0gICAgbV9jb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nID0gbV9jb250 ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nIHx8IFRleHRVdGlsOjpjb250YWluc1N0cm9uZ0Rp cmVjdGlvbmFsaXR5VGV4dCh0ZXh0KTsKKyAgICBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3Jk ZXJpbmcgPSBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcgfHwgcmVxdWlyZXNWaXN1 YWxSZW9yZGVyaW5nKGlubGluZVRleHRCb3gpOwogICAgIG1faXNOb25CaWRpVGV4dEFuZEZvcmNl ZExpbmVCcmVha09ubHlDb250ZW50ID0gbV9pc05vbkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFr T25seUNvbnRlbnQgJiYgIW1fY29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZzsKICAgICBh dXRvJiBzdHlsZSA9IGlubGluZVRleHRCb3guc3R5bGUoKTsKICAgICBhdXRvIHNob3VsZFByZXNl cnZlU3BhY2VzQW5kVGFicyA9IFRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMo aW5saW5lVGV4dEJveCk7CkBAIC03NDQsOCArNzQ1LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxk ZXI6OmhhbmRsZVRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gs IEkKIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVJbmxpbmVCb3hTdGFydChjb25zdCBC b3gmIGlubGluZUJveCwgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogewogICAgIGlubGluZUl0 ZW1zLmFwcGVuZCh7IGlubGluZUJveCwgSW5saW5lSXRlbTo6VHlwZTo6SW5saW5lQm94U3RhcnQg fSk7Ci0gICAgYXV0byYgc3R5bGUgPSBpbmxpbmVCb3guc3R5bGUoKTsKLSAgICBtX2NvbnRlbnRS ZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcgPSBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJp bmcgfHwgIXN0eWxlLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSB8fCAoc3R5bGUucnRsT3JkZXJp bmcoKSA9PSBPcmRlcjo6TG9naWNhbCAmJiBzdHlsZS51bmljb2RlQmlkaSgpICE9IFVuaWNvZGVC aWRpOjpOb3JtYWwpOworICAgIG1fY29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZyA9IG1f Y29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZyB8fCByZXF1aXJlc1Zpc3VhbFJlb3JkZXJp bmcoaW5saW5lQm94KTsKICAgICBtX2lzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5 Q29udGVudCA9IGZhbHNlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGlu ZUxheW91dC5jcHAKaW5kZXggNjRiZjRlY2ZlNzRmLi5hMzdhNTFhMTc2MTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRp b25MaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v aW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTEzMDUsMjAgKzEzMDUs NyBAQCBib29sIExpbmVMYXlvdXQ6Omhhc091dE9mRmxvd0NvbnRlbnQoKSBjb25zdAogCiBib29s IExpbmVMYXlvdXQ6OmNvbnRlbnROZWVkc1Zpc3VhbFJlb3JkZXJpbmcoKSBjb25zdAogewotICAg IC8vIFdlIGRvbid0IHRlbmQgdG8gaGF2ZSB0b28gbWFueSByZW5kZXJlcnMsIHNob3VsZCBjYWNo ZSBpZiB0aGlzIGdldHMgdG9vIGhvdC4KLSAgICBmb3IgKGF1dG8gcmVuZGVyZXIgOiBtX2JveFRy ZWUucmVuZGVyZXJzKCkpIHsKLSAgICAgICAgaWYgKCFyZW5kZXJlcikKLSAgICAgICAgICAgIGNv bnRpbnVlOwotICAgICAgICBpZiAoaXM8UmVuZGVyVGV4dD4oKnJlbmRlcmVyKSAmJiBkb3duY2Fz dDxSZW5kZXJUZXh0PigqcmVuZGVyZXIpLm5lZWRzVmlzdWFsUmVvcmRlcmluZygpKQotICAgICAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIGlmIChpczxSZW5kZXJJbmxpbmU+KCpyZW5kZXJl cikpIHsKLSAgICAgICAgICAgIGF1dG8mIHN0eWxlID0gcmVuZGVyZXItPnN0eWxlKCk7Ci0gICAg ICAgICAgICBhdXRvIGNvbnRlbnROZWVkc0JpZGlSZW9yZGVyaW5nID0gIXN0eWxlLmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKSB8fCAoc3R5bGUucnRsT3JkZXJpbmcoKSA9PSBPcmRlcjo6TG9naWNh bCAmJiBzdHlsZS51bmljb2RlQmlkaSgpICE9IFVuaWNvZGVCaWRpOjpOb3JtYWwpOwotICAgICAg ICAgICAgaWYgKGNvbnRlbnROZWVkc0JpZGlSZW9yZGVyaW5nKQotICAgICAgICAgICAgICAgIHJl dHVybiB0cnVlOwotICAgICAgICB9Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1 cm4gbV9pbmxpbmVGb3JtYXR0aW5nU3RhdGUuY29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmlu ZygpOwogfQogCiAjaWYgRU5BQkxFKFRSRUVfREVCVUdHSU5HKQo= 467664 2023-09-12 08:30:43 -0700 2023-09-12 11:52:12 -0700 Patch bug-261452-20230912083042.patch text/plain 11452 zalan RnJvbSAzNjdkMDFjNWY0ZDkzNjBhMDg3MGJjYTg2NDZlNTVjYTkwOTI4OGM4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgMTEgU2VwIDIwMjMgMTk6NDA6MTAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBm YXN0L2NhbnZhcy9pbWFnZURhdGEtY29uc2lzdGVuY3kuaHRtbCBpcyBhIGZsYWt5CiB0aW1lb3V0 IGluIGRlYnVnIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjE0NTIK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKZmFzdC9jYW52YXMvaW1hZ2VEYXRhLWNvbnNp c3RlbmN5Lmh0bWwgcHJvZHVjZXMgb3ZlciAzMEsgYm94ZXMgYnkgYXBwZW5kaW5nIG11bHRpcGxl CmJveGVzIGF0IGEgdGltZSBmb2xsb3dlZCBieSBhIGZvcmNlZCBsYXlvdXQuCkNhbGxpbmcgTGlu ZUxheW91dDo6Y29udGVudE5lZWRzVmlzdWFsUmVvcmRlcmluZyBpbiBkZWJ1ZyBtb2RlIG9uIHN1 Y2ggYW4gZXh0ZW5kZWQgY29udGVudCBpcyBjb3N0bHkuCgpUaGlzIHBhdGNoIGNhY2hlcyB0aGUg ImNvbnRlbnQgbmVlZHMgdmlzdWFsIHJlb3JkZXJpbmciIGJpdCBkdXJpbmcgaW5saW5lIGl0ZW1z IGJ1aWxkaW5nIHNvIHRoYXQKd2UgZG9uJ3QgaGF2ZSB0byB0cmF2ZXJzZSB0aGUgY29udGVudCBh dCBpbnZhbGlkYXRpb24gdGltZSB0byBzZWUgaWYgaXQgaXMgZWxpZ2libGUgZm9yIHBhcnRpYWwg bGF5b3V0LgoKSW50cm9kdWNpbmcgdGhpcyBiaXQgYWxzbyBoZWxwcyB3aXRoIHRoZSB1cGNvbWlu ZyBiaWRpIGNvbnRlbnQgaW52YWxpZGF0aW9uLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaDoKKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlOjpzZXRDb250ZW50UmVxdWlyZXNWaXN1YWxS ZW9yZGVyaW5nKToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlOjpjb250 ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nIGNvbnN0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgooV2Vi Q29yZTo6TGF5b3V0OjpyZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcpOgooV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVJdGVtc0J1aWxkZXI6OnRyYXZlcnNlVW50aWxEYW1hZ2VkKToKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjppbml0aWFsaXplTGF5b3V0UXVldWUpOiByZW1vdmUg cmVkdW5kYW50IGNoZWNrLiB0cmF2ZXJzZVVudGlsRGFtYWdlZCB0YWtlcyBjYXJlIG9mIHRoZSBm aXJzdCBjaGlsZC4KKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpjb2xsZWN0 SW5saW5lSXRlbXMpOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRs ZVRleHRDb250ZW50KToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpoYW5k bGVJbmxpbmVCb3hTdGFydCk6CihXZWJDb3JlOjpMYXlvdXQ6OmlzTm9uQmlkaVRleHRPckZvcmNl ZExpbmVCcmVhayk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OmNvbnRlbnROZWVkc1Zpc3VhbFJlb3JkZXJpbmcgY29u c3QpOgotLS0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmggICAgICAgICAgICB8 ICA0ICsrKysKIC4uLi9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCAgICAgICAgICAgICB8 IDIyICsrKysrKysrKy0tLS0tLS0tLS0KIC4uLi9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkNvdmVyYWdlLmNwcCB8IDE2ICsrKysrKysrKysrKy0tCiAuLi4vaW5saW5lL0xheW91dEludGVn cmF0aW9uTGluZUxheW91dC5jcHAgICAgfCAxNSArLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5n ZWQsIDMwIGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRp bmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKaW5kZXggMjhjN2IyZTU5NmExLi4zNTE1NjM1Y2Q4 MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oCkBAIC00 OCw2ICs0OCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldElubGluZUl0ZW1zKElubGluZUl0ZW1z JiYgaW5saW5lSXRlbXMpIHsgbV9pbmxpbmVJdGVtcyA9IFdURk1vdmUoaW5saW5lSXRlbXMpOyB9 CiAgICAgdm9pZCBhcHBlbmRJbmxpbmVJdGVtcyhJbmxpbmVJdGVtcyYmIGlubGluZUl0ZW1zKSB7 IG1faW5saW5lSXRlbXMuYXBwZW5kVmVjdG9yKFdURk1vdmUoaW5saW5lSXRlbXMpKTsgfQogCisg ICAgdm9pZCBzZXRDb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nKGJvb2wgY29udGVudFJl cXVpcmVzVmlzdWFsUmVvcmRlcmluZykgeyBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJp bmcgPSBjb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nOyB9CisgICAgYm9vbCBjb250ZW50 UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50UmVxdWly ZXNWaXN1YWxSZW9yZGVyaW5nOyB9CisKICAgICB2b2lkIHNldElzTm9uQmlkaVRleHRBbmRGb3Jj ZWRMaW5lQnJlYWtPbmx5Q29udGVudChib29sIGlzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJl YWtPbmx5Q29udGVudCkgeyBtX2lzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5Q29u dGVudCA9IGlzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5Q29udGVudDsgfQogICAg IGJvb2wgaXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250ZW50KCkgY29uc3Qg eyByZXR1cm4gbV9pc05vbkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFrT25seUNvbnRlbnQ7IH0K IApAQCAtNjEsNiArNjQsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIElubGluZUl0ZW1zIG1f aW5saW5lSXRlbXM7CiAgICAgc3RkOjpvcHRpb25hbDxJbnRyaW5zaWNXaWR0aEhhbmRsZXI6Okxp bmVCcmVha2luZ1Jlc3VsdD4gbV9tYXhpbXVtSW50cmluc2ljV2lkdGhMYXlvdXRSZXN1bHQgeyB9 OworICAgIGJvb2wgbV9jb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nIHsgZmFsc2UgfTsK ICAgICBib29sIG1faXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250ZW50IHsg ZmFsc2UgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3Bw CmluZGV4IGU3MDMwZmRkYjJiYi4uYjlmMWI3NzAwNjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUl0ZW1zQnVpbGRlci5jcHAKQEAgLTEyOCwxNSArMTI4LDE1IEBAIHZvaWQgSW5saW5l SXRlbXNCdWlsZGVyOjpidWlsZChJbmxpbmVJdGVtUG9zaXRpb24gc3RhcnRQb3NpdGlvbikKICNl bmRpZgogfQogCi1zdGF0aWMgYm9vbCBpc05vbkJpZGlUZXh0T3JGb3JjZWRMaW5lQnJlYWsoY29u c3QgQm94JiBsYXlvdXRCb3gpCitzdGF0aWMgYm9vbCByZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmco Y29uc3QgQm94JiBsYXlvdXRCb3gpCiB7Ci0gICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guaXNJ bmxpbmVCb3goKSA/IGxheW91dEJveC5zdHlsZSgpIDogbGF5b3V0Qm94LnBhcmVudCgpLnN0eWxl KCk7Ci0gICAgYXV0byBjb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nID0gIXN0eWxlLmlz TGVmdFRvUmlnaHREaXJlY3Rpb24oKSB8fCAoc3R5bGUucnRsT3JkZXJpbmcoKSA9PSBPcmRlcjo6 TG9naWNhbCAmJiBzdHlsZS51bmljb2RlQmlkaSgpICE9IFVuaWNvZGVCaWRpOjpOb3JtYWwpOwot ICAgIGlmIChjb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nKQotICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgaWYgKGlzPElubGluZVRleHRCb3g+KGxheW91dEJveCkpCiAgICAgICAgIHJl dHVybiBUZXh0VXRpbDo6Y29udGFpbnNTdHJvbmdEaXJlY3Rpb25hbGl0eVRleHQoZG93bmNhc3Q8 SW5saW5lVGV4dEJveD4obGF5b3V0Qm94KS5jb250ZW50KCkpOwotICAgIHJldHVybiBsYXlvdXRC b3guaXNMaW5lQnJlYWtCb3goKTsKKyAgICBpZiAobGF5b3V0Qm94LmlzSW5saW5lQm94KCkgJiYg bGF5b3V0Qm94LmlzSW5GbG93KCkpIHsKKyAgICAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3gu c3R5bGUoKTsKKyAgICAgICAgcmV0dXJuICFzdHlsZS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkg fHwgKHN0eWxlLnJ0bE9yZGVyaW5nKCkgPT0gT3JkZXI6OkxvZ2ljYWwgJiYgc3R5bGUudW5pY29k ZUJpZGkoKSAhPSBVbmljb2RlQmlkaTo6Tm9ybWFsKTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNl OwogfQogCiBib29sIElubGluZUl0ZW1zQnVpbGRlcjo6dHJhdmVyc2VVbnRpbERhbWFnZWQoTGF5 b3V0UXVldWUmIGxheW91dFF1ZXVlLCBjb25zdCBCb3gmIHN1YnRyZWVSb290LCBjb25zdCBCb3gm IGZpcnN0RGFtYWdlZExheW91dEJveCkKQEAgLTE0NCw3ICsxNDQsOCBAQCBib29sIElubGluZUl0 ZW1zQnVpbGRlcjo6dHJhdmVyc2VVbnRpbERhbWFnZWQoTGF5b3V0UXVldWUmIGxheW91dFF1ZXVl LCBjb25zdCBCbwogICAgIGlmICgmc3VidHJlZVJvb3QgPT0gJmZpcnN0RGFtYWdlZExheW91dEJv eCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBtX2lzTm9uQmlkaVRleHRBbmRGb3JjZWRM aW5lQnJlYWtPbmx5Q29udGVudCA9IG1faXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09u bHlDb250ZW50ICYmIGlzTm9uQmlkaVRleHRPckZvcmNlZExpbmVCcmVhayhzdWJ0cmVlUm9vdCk7 CisgICAgbV9jb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nID0gbV9jb250ZW50UmVxdWly ZXNWaXN1YWxSZW9yZGVyaW5nIHx8IHJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZyhzdWJ0cmVlUm9v dCk7CisgICAgbV9pc05vbkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFrT25seUNvbnRlbnQgPSBt X2lzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5Q29udGVudCAmJiAhbV9jb250ZW50 UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nICYmIChzdWJ0cmVlUm9vdC5pc0lubGluZVRleHRCb3go KSB8fCBzdWJ0cmVlUm9vdC5pc0xpbmVCcmVha0JveCgpKTsKIAogICAgIGF1dG8gc2hvdWxkU2tp cFN1YnRyZWUgPSBzdWJ0cmVlUm9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCk7CiAg ICAgaWYgKCFzaG91bGRTa2lwU3VidHJlZSAmJiBpczxFbGVtZW50Qm94PihzdWJ0cmVlUm9vdCkg JiYgZG93bmNhc3Q8RWxlbWVudEJveD4oc3VidHJlZVJvb3QpLmhhc0NoaWxkKCkpIHsKQEAgLTE5 MSw3ICsxOTIsNiBAQCBJbmxpbmVJdGVtc0J1aWxkZXI6OkxheW91dFF1ZXVlIElubGluZUl0ZW1z QnVpbGRlcjo6aW5pdGlhbGl6ZUxheW91dFF1ZXVlKElubGluZQogCiAgICAgYXV0byYgZmlyc3RE YW1hZ2VkTGF5b3V0Qm94ID0gZXhpc3RpbmdJbmxpbmVJdGVtc1tzdGFydFBvc2l0aW9uLmluZGV4 XS5sYXlvdXRCb3goKTsKICAgICBhdXRvJiBmaXJzdENoaWxkID0gKnJvb3QuZmlyc3RDaGlsZCgp OwotICAgIG1faXNOb25CaWRpVGV4dEFuZEZvcmNlZExpbmVCcmVha09ubHlDb250ZW50ID0gbV9p c05vbkJpZGlUZXh0QW5kRm9yY2VkTGluZUJyZWFrT25seUNvbnRlbnQgJiYgaXNOb25CaWRpVGV4 dE9yRm9yY2VkTGluZUJyZWFrKGZpcnN0Q2hpbGQpOwogICAgIExheW91dFF1ZXVlIGxheW91dFF1 ZXVlOwogICAgIGxheW91dFF1ZXVlLmFwcGVuZChmaXJzdENoaWxkKTsKICAgICB0cmF2ZXJzZVVu dGlsRGFtYWdlZChsYXlvdXRRdWV1ZSwgZmlyc3RDaGlsZCwgZmlyc3REYW1hZ2VkTGF5b3V0Qm94 KTsKQEAgLTI2Nyw2ICsyNjcsNyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6Y29sbGVjdElu bGluZUl0ZW1zKElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcywgSW5saW5lSXRlbQogICAgICAgICB9 CiAgICAgfQogICAgIG1fZm9ybWF0dGluZ1N0YXRlLnNldElzTm9uQmlkaVRleHRBbmRGb3JjZWRM aW5lQnJlYWtPbmx5Q29udGVudChtX2lzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5 Q29udGVudCk7CisgICAgbV9mb3JtYXR0aW5nU3RhdGUuc2V0Q29udGVudFJlcXVpcmVzVmlzdWFs UmVvcmRlcmluZyhtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcpOwogfQogCiBzdGF0 aWMgdm9pZCByZXBsYWNlTm9uUHJlc2VydmVkTmV3TGluZUFuZFRhYkNoYXJhY3RlcnNBbmRBcHBl bmQoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwgU3RyaW5nQnVpbGRlciYgcGFy YWdyYXBoQ29udGVudEJ1aWxkZXIpCkBAIC02NTEsNyArNjUyLDcgQEAgdm9pZCBJbmxpbmVJdGVt c0J1aWxkZXI6OmhhbmRsZVRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRl eHRCb3gsIEkKICAgICBpZiAoaW5saW5lVGV4dEJveC5pc0NvbWJpbmVkKCkpCiAgICAgICAgIHJl dHVybiBpbmxpbmVJdGVtcy5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZU5vbldoaXRlc3Bh Y2VJdGVtKGlubGluZVRleHRCb3gsIHsgfSwgY29udGVudExlbmd0aCwgVUJJRElfREVGQVVMVF9M VFIsIGZhbHNlLCB7IH0pKTsKIAotICAgIG1fY29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmlu ZyA9IG1fY29udGVudFJlcXVpcmVzVmlzdWFsUmVvcmRlcmluZyB8fCBUZXh0VXRpbDo6Y29udGFp bnNTdHJvbmdEaXJlY3Rpb25hbGl0eVRleHQodGV4dCk7CisgICAgbV9jb250ZW50UmVxdWlyZXNW aXN1YWxSZW9yZGVyaW5nID0gbV9jb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nIHx8IHJl cXVpcmVzVmlzdWFsUmVvcmRlcmluZyhpbmxpbmVUZXh0Qm94KTsKICAgICBtX2lzTm9uQmlkaVRl eHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5Q29udGVudCA9IG1faXNOb25CaWRpVGV4dEFuZEZvcmNl ZExpbmVCcmVha09ubHlDb250ZW50ICYmICFtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJp bmc7CiAgICAgYXV0byYgc3R5bGUgPSBpbmxpbmVUZXh0Qm94LnN0eWxlKCk7CiAgICAgYXV0byBz aG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMgPSBUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVTcGFj ZXNBbmRUYWJzKGlubGluZVRleHRCb3gpOwpAQCAtNzQ0LDggKzc0NSw3IEBAIHZvaWQgSW5saW5l SXRlbXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxp bmVUZXh0Qm94LCBJCiB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlSW5saW5lQm94U3Rh cnQoY29uc3QgQm94JiBpbmxpbmVCb3gsIElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKIHsKICAg ICBpbmxpbmVJdGVtcy5hcHBlbmQoeyBpbmxpbmVCb3gsIElubGluZUl0ZW06OlR5cGU6OklubGlu ZUJveFN0YXJ0IH0pOwotICAgIGF1dG8mIHN0eWxlID0gaW5saW5lQm94LnN0eWxlKCk7Ci0gICAg bV9jb250ZW50UmVxdWlyZXNWaXN1YWxSZW9yZGVyaW5nID0gbV9jb250ZW50UmVxdWlyZXNWaXN1 YWxSZW9yZGVyaW5nIHx8ICFzdHlsZS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgfHwgKHN0eWxl LnJ0bE9yZGVyaW5nKCkgPT0gT3JkZXI6OkxvZ2ljYWwgJiYgc3R5bGUudW5pY29kZUJpZGkoKSAh PSBVbmljb2RlQmlkaTo6Tm9ybWFsKTsKKyAgICBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3Jk ZXJpbmcgPSBtX2NvbnRlbnRSZXF1aXJlc1Zpc3VhbFJlb3JkZXJpbmcgfHwgcmVxdWlyZXNWaXN1 YWxSZW9yZGVyaW5nKGlubGluZUJveCk7CiAgICAgbV9pc05vbkJpZGlUZXh0QW5kRm9yY2VkTGlu ZUJyZWFrT25seUNvbnRlbnQgPSBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2Uu Y3BwCmluZGV4IDRkYTU3MGZhMzdjMi4uYzQ4MTc0N2QwYzRiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u Q292ZXJhZ2UuY3BwCkBAIC00MDcsNiArNDA3LDcgQEAgYm9vbCBzaG91bGRJbnZhbGlkYXRlTGlu ZUxheW91dFBhdGhBZnRlckNoYW5nZUZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIHJvb3RCbG8K ICAgICB9OwogICAgIGlmICghaXNTdXBwb3J0ZWRSZW5kZXJlcldpdGhDaGFuZ2UocmVuZGVyZXIp KQogICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAgIGF1dG8gaXNTdXBwb3J0ZWRQYXJlbnQgPSBb Jl0gewogICAgICAgICBhdXRvKiBwYXJlbnQgPSByZW5kZXJlci5wYXJlbnQoKTsKICAgICAgICAg Ly8gQ29udGVudCBhcHBlbmQgdW5kZXIgZXhpc3RpbmcgaW5saW5lIGJveCBpcyBub3QgeWV0IHN1 cHBvcnRlZC4KQEAgLTQxNCwxMiArNDE1LDIzIEBAIGJvb2wgc2hvdWxkSW52YWxpZGF0ZUxpbmVM YXlvdXRQYXRoQWZ0ZXJDaGFuZ2VGb3IoY29uc3QgUmVuZGVyQmxvY2tGbG93JiByb290QmxvCiAg ICAgfTsKICAgICBpZiAoIWlzU3VwcG9ydGVkUGFyZW50KCkpCiAgICAgICAgIHJldHVybiB0cnVl OwotCiAgICAgaWYgKGxpbmVMYXlvdXQuaGFzT3V0T2ZGbG93Q29udGVudCgpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICBpZiAocm9vdEJsb2NrQ29udGFpbmVyLmNvbnRhaW5zRmxvYXRzKCkp CiAgICAgICAgIHJldHVybiB0cnVlOwotICAgIGlmIChsaW5lTGF5b3V0LmNvbnRlbnROZWVkc1Zp c3VhbFJlb3JkZXJpbmcoKSB8fCAoaXM8UmVuZGVyVGV4dD4ocmVuZGVyZXIpICYmIExheW91dDo6 VGV4dFV0aWw6OmNvbnRhaW5zU3Ryb25nRGlyZWN0aW9uYWxpdHlUZXh0KGRvd25jYXN0PFJlbmRl clRleHQ+KHJlbmRlcmVyKS50ZXh0KCkpKSkgeworCisgICAgYXV0byBpc0JpZGlDb250ZW50ID0g WyZdIHsKKyAgICAgICAgaWYgKGxpbmVMYXlvdXQuY29udGVudE5lZWRzVmlzdWFsUmVvcmRlcmlu ZygpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChpczxSZW5kZXJUZXh0 PihyZW5kZXJlcikpCisgICAgICAgICAgICByZXR1cm4gTGF5b3V0OjpUZXh0VXRpbDo6Y29udGFp bnNTdHJvbmdEaXJlY3Rpb25hbGl0eVRleHQoZG93bmNhc3Q8UmVuZGVyVGV4dD4ocmVuZGVyZXIp LnRleHQoKSk7CisgICAgICAgIGlmIChpczxSZW5kZXJJbmxpbmU+KHJlbmRlcmVyKSkgeworICAg ICAgICAgICAgYXV0byYgc3R5bGUgPSByZW5kZXJlci5zdHlsZSgpOworICAgICAgICAgICAgcmV0 dXJuICFzdHlsZS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgfHwgKHN0eWxlLnJ0bE9yZGVyaW5n KCkgPT0gT3JkZXI6OkxvZ2ljYWwgJiYgc3R5bGUudW5pY29kZUJpZGkoKSAhPSBVbmljb2RlQmlk aTo6Tm9ybWFsKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfTsKKyAg ICBpZiAoaXNCaWRpQ29udGVudCgpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJbmxpbmVJdGVtc0J1 aWxkZXIgbmVlZHMgc29tZSB3b3JrIHRvIHN1cHBvcnQgcGFyYWdyYXBoIGxldmVsIGJpZGkgaGFu ZGxpbmcuCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5 b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0 SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAppbmRleCBiY2MwOGE0MWIzMmQuLmM0ZDM0Njk1ODEx ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9M YXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAt MTI5OSwyMCArMTI5OSw3IEBAIGJvb2wgTGluZUxheW91dDo6aGFzT3V0T2ZGbG93Q29udGVudCgp IGNvbnN0CiAKIGJvb2wgTGluZUxheW91dDo6Y29udGVudE5lZWRzVmlzdWFsUmVvcmRlcmluZygp IGNvbnN0CiB7Ci0gICAgLy8gV2UgZG9uJ3QgdGVuZCB0byBoYXZlIHRvbyBtYW55IHJlbmRlcmVy cywgc2hvdWxkIGNhY2hlIGlmIHRoaXMgZ2V0cyB0b28gaG90LgotICAgIGZvciAoYXV0byByZW5k ZXJlciA6IG1fYm94VHJlZS5yZW5kZXJlcnMoKSkgewotICAgICAgICBpZiAoIXJlbmRlcmVyKQot ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIGlmIChpczxSZW5kZXJUZXh0PigqcmVuZGVy ZXIpICYmIGRvd25jYXN0PFJlbmRlclRleHQ+KCpyZW5kZXJlcikubmVlZHNWaXN1YWxSZW9yZGVy aW5nKCkpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgaWYgKGlzPFJlbmRlcklu bGluZT4oKnJlbmRlcmVyKSkgewotICAgICAgICAgICAgYXV0byYgc3R5bGUgPSByZW5kZXJlci0+ c3R5bGUoKTsKLSAgICAgICAgICAgIGF1dG8gY29udGVudE5lZWRzQmlkaVJlb3JkZXJpbmcgPSAh c3R5bGUuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpIHx8IChzdHlsZS5ydGxPcmRlcmluZygpID09 IE9yZGVyOjpMb2dpY2FsICYmIHN0eWxlLnVuaWNvZGVCaWRpKCkgIT0gVW5pY29kZUJpZGk6Ok5v cm1hbCk7Ci0gICAgICAgICAgICBpZiAoY29udGVudE5lZWRzQmlkaVJlb3JkZXJpbmcpCi0gICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIGZh bHNlOworICAgIHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZS5jb250ZW50UmVxdWlyZXNW aXN1YWxSZW9yZGVyaW5nKCk7CiB9CiAKICNpZiBFTkFCTEUoVFJFRV9ERUJVR0dJTkcpCg==