219962 2020-12-16 15:04:56 -0800 [LFC][IFC] Add fast path vertical alignment for non-stretchy, baseline aligned atomic inline level boxes 2020-12-19 05:16:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1715240 0 zalan 2020-12-16 15:04:56 -0800 ssia 1715247 1 416366 zalan 2020-12-16 15:35:49 -0800 Created attachment 416366 Patch 1715249 2 webkit-bug-importer 2020-12-16 15:37:43 -0800 <rdar://problem/72402622> 1715301 3 416382 zalan 2020-12-16 19:49:45 -0800 Created attachment 416382 Patch 1715310 4 416385 zalan 2020-12-16 20:23:08 -0800 Created attachment 416385 Patch 1715330 5 416385 koivisto 2020-12-16 23:27:08 -0800 Comment on attachment 416385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416385&action=review > Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp:345 > -void LineBoxBuilder::computeLineBoxHeightAndalignInlineLevelBoxesVertically(LineBox& lineBox) > +void LineBoxBuilder::computeLineBoxHeightAndAlignInlineLevelBoxesVertically(LineBox& lineBox) The important fix! 1715434 6 416435 zalan 2020-12-17 10:11:35 -0800 Created attachment 416435 Patch 1715889 7 416567 zalan 2020-12-18 21:27:49 -0800 Created attachment 416567 Patch 1715901 8 ews-feeder 2020-12-19 05:16:28 -0800 Committed r271002: <https://trac.webkit.org/changeset/271002> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416567. 416366 2020-12-16 15:35:49 -0800 2020-12-16 19:49:43 -0800 Patch bug-219962-20201216153548.patch text/plain 7901 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyMDI4ZjczZTQ1ZThl ODdiMjdjMTIzODNlMGFjMDFkZTRkYzgxMi4uOGNlMjcyN2Y5NzBhMGIzYTAwZWEwNjZiNWVkMGVi MzFjMmQ3MTg4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgZmFz dCBwYXRoIHZlcnRpY2FsIGFsaWdubWVudCBmb3Igbm9uLXN0cmV0Y2h5LCBiYXNlbGluZSBhbGln bmVkIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTk2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGVzdGltYXRlIHRoZSBsb2dpY2FsIHRvcCBvZiBz aW1wbGUgYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyB3aGlsZSB0aGV5IGFyZSBiZWluZyBjb25z dHJ1Y3RlZC4gSXQgaGVscHMgdG8gYXZvaWQgdGhlIHJhdGhlciBleHBlbnNpdmUKKyAgICAgICAg dGhyZWUtcGFzcyB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29kZSAoc2VlIGNvbXB1dGVMaW5lQm94SGVp Z2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSkgd2hlbiB0aGUgbGluZSBoYXMg bm90aGluZyBidXQgc3VjaCBzaW1wbGUgYm94ZXMuIAorCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpMaW5lQm94QnVpbGRlcik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVz KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5l Qm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZGFs aWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOiBEZWxldGVkLgorCiAyMDIwLTEyLTE2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRnJh bWVWaWV3OjptX2N1c3RvbVNpemVGb3JSZXNpemVFdmVudCBhbiBPcHRpb25hbDxJbnRTaXplPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAz MDAzMGY4NWQ4MGIxMzdmNmRlYTYxYTRiNDIwZmQ2ZmRlNGY1NmNmLi4xZjJkNDE2OTU5ZGNlNDgw MzRmMTMzN2VmM2UwOTAyNDQ3YjBiMGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIHZvaWQgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYpIGNvbnN0OwogICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhM aW5lQm94JiwgY29uc3QgTGluZTo6UnVuTGlzdCYpOwotICAgIHZvaWQgY29tcHV0ZUxpbmVCb3hI ZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmVCb3gmKTsKKyAgICB2 b2lkIGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxs eShMaW5lQm94Jik7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0 dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9 CiAgICAgY29uc3QgQm94JiByb290Qm94KCkgY29uc3QgeyByZXR1cm4gZm9ybWF0dGluZ0NvbnRl eHQoKS5yb290KCk7IH0KQEAgLTU4LDYgKzU4LDcgQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAg ICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDsKKyAgICBib29sIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB7IGZh bHNlIH07CiB9OwogCiBzdHJ1Y3QgSGFuZ2luZ1RyYWlsaW5nV2hpdGVzcGFjZUNvbnRlbnQgewpA QCAtMTQ4LDYgKzE0OSw4IEBAIHN0YXRpYyBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jp em9udGFsQWxpZ25tZW50T2Zmc2V0KGNvbnN0IExpbmU6OlJ1bkxpc3QmCiAKIExpbmVCb3hCdWls ZGVyOjpMaW5lQm94QnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQpCiAgICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGlu ZUZvcm1hdHRpbmdDb250ZXh0KQorICAgIC8vIEZJWE1FOiBsaW5lLWhlaWdodCBzaG91bGQgbm90 IHJlcXVpcmUgY29tcGxleCBhbGlnbm1lbnQgaW4gc2ltcGxlIGNhc2VzLgorICAgICwgbV9pbmxp bmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KCFyb290Qm94KCkuc3R5bGUoKS5saW5l SGVpZ2h0KCkuaXNOZWdhdGl2ZSgpKQogewogfQogCkBAIC0xNjIsNyArMTY1LDggQEAgTGluZUJv eCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBs aW5lQ29udGVudCkKICAgICBpZiAoYXV0byBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5 b3V0Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRl eHRBbGlnbigpLCBsaW5lTG9naWNhbFdpZHRoLCBjb250ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29u dGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpKQogICAgICAgICBsaW5lQm94LnNldEhv cml6b250YWxBbGlnbm1lbnRPZmZzZXQoKmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQpOwogICAg IGNvbnN0cnVjdElubGluZUxldmVsQm94ZXMobGluZUJveCwgcnVucyk7Ci0gICAgY29tcHV0ZUxp bmVCb3hIZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KGxpbmVCb3gpOwor ICAgIGlmIChtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQpCisgICAgICAg IGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseShs aW5lQm94KTsKICAgICByZXR1cm4gbGluZUJveDsKIH0KIApAQCAtMjUxLDcgKzI1NSw3IEBAIHZv aWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGlu ZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgIH0KICAgICB9OwogICAgIGNyZWF0ZVdyYXBw ZWRJbmxpbmVCb3hlcygpOwotCisgICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gucm9v dElubGluZUJveCgpOwogICAgIGZvciAoYXV0byYgcnVuIDogcnVucykgewogICAgICAgICBhdXRv JiBsYXlvdXRCb3ggPSBydW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIGF1dG8gbG9naWNhbExlZnQg PSBob3Jpem9udGFsQWxpZ21lbnRPZmZzZXQgKyBydW4ubG9naWNhbExlZnQoKTsKQEAgLTI3NSwz NCArMjc5LDY2IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94 ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgICAgICAvLyBsZXZl bCBib3ggY29udHJpYnV0ZXMgMHB4IHRvIHRoZSBsaW5lIGJveCBoZWlnaHQsIGl0IHNob3VsZCBu b3QgYmUgY29uc2lkZXJlZCBlbXB0eS4KICAgICAgICAgICAgIGlmIChtYXJnaW5Cb3hIZWlnaHQg fHwgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSB8fCBpbmxpbmVMZXZlbEJv eEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCkpCiAgICAgICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2 ZWxCb3gtPnNldElzTm9uRW1wdHkoKTsKKyAgICAgICAgICAgIC8vIExldCdzIGVzdGltYXRlIHRo ZSBsb2dpY2FsIHRvcCBzbyB0aGF0IHdlIGNhbiBhdm9pZCBydW5uaW5nIHRoZSBhbGlnbm1lbnQg b24gc2ltcGxlIGlubGluZSBib3hlcy4gIAorICAgICAgICAgICAgYXV0byBhbGlnbklubGluZUJv eElmRWxpZ2libGUgPSBbJl0geworICAgICAgICAgICAgICAgIGlmIChtX2lubGluZUxldmVsQm94 ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgICAgICAvLyBCYXNlbGluZSBhbGlnbmVkLCBub24tc3RyZXRjaHkgZGlyZWN0IGNo aWxkcmVuIGFyZSBjb25zaWRlcmVkIHRvIGJlIHNpbXBsZSBmb3Igbm93LgorICAgICAgICAgICAg ICAgIGF1dG8gaXNDb25zaWRlcmVkU2ltcGxlID0gJmxheW91dEJveC5wYXJlbnQoKSA9PSAmcm9v dEJveCgpCisgICAgICAgICAgICAgICAgICAgICYmIGxheW91dEJveC5zdHlsZSgpLnZlcnRpY2Fs QWxpZ24oKSA9PSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZQorICAgICAgICAgICAgICAgICAgICAm JiBtYXJnaW5Cb3hIZWlnaHQgPD0gcm9vdElubGluZUJveC5iYXNlbGluZSgpOworICAgICAgICAg ICAgICAgIGlmICghaXNDb25zaWRlcmVkU2ltcGxlKSB7CisgICAgICAgICAgICAgICAgICAgIG1f aW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCA9IHRydWU7CisgICAgICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYXRv bWljSW5saW5lTGV2ZWxCb3gtPnNldExvZ2ljYWxUb3Aocm9vdElubGluZUJveC5iYXNlbGluZSgp IC0gYXNjZW50KTsKKyAgICAgICAgICAgIH07CisgICAgICAgICAgICBhbGlnbklubGluZUJveElm RWxpZ2libGUoKTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92 ZShhdG9taWNJbmxpbmVMZXZlbEJveCkpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0lubGlu ZUJveFN0YXJ0KCkpIHsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAg IC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3Igc2ltcGxlIGlubGluZSBib3hlcyB0b28uCisgICAg ICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCA9IHRydWU7CisgICAg ICAgIGlmIChydW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7CiAgICAgICAgICAgICBhdXRvIGluaXRp YWxMb2dpY2FsV2lkdGggPSBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpIC0gcnVuLmxvZ2ljYWxMZWZ0 KCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5pdGlhbExvZ2ljYWxXaWR0aCA+PSAwKTsKICAgICAg ICAgICAgIGF1dG8gaW5saW5lQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlu bGluZUJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBpbml0aWFsTG9naWNhbFdpZHRoKTsKICAg ICAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goKmlubGluZUJveCk7CiAg ICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94KSk7 Ci0gICAgICAgIH0gZWxzZSBpZiAocnVuLmlzSW5saW5lQm94RW5kKCkpIHsKKyAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIGlmIChydW4uaXNJbmxpbmVCb3hFbmQoKSkg ewogICAgICAgICAgICAgLy8gQWRqdXN0IHRoZSBsb2dpY2FsIHdpZHRoIHdoZW4gdGhlIGlubGlu ZSBsZXZlbCBjb250YWluZXIgY2xvc2VzIG9uIHRoaXMgbGluZS4KICAgICAgICAgICAgIGF1dG8m IGlubGluZUJveCA9IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94 KTsKICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3guaXNJbmxpbmVCb3goKSk7CiAgICAgICAg ICAgICBpbmxpbmVCb3guc2V0TG9naWNhbFdpZHRoKHJ1bi5sb2dpY2FsUmlnaHQoKSAtIGlubGlu ZUJveC5sb2dpY2FsTGVmdCgpKTsKLSAgICAgICAgfSBlbHNlIGlmIChydW4uaXNUZXh0KCkgfHwg cnVuLmlzU29mdExpbmVCcmVhaygpKSB7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg fQorICAgICAgICBpZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSkgewog ICAgICAgICAgICAgLy8gRklYTUU6IEFkanVzdCBub24tZW1wdHkgaW5saW5lIGJveCBoZWlnaHQg d2hlbiBnbHlwaHMgZnJvbSB0aGUgbm9uLXByaW1hcnkgZm9udCBzdHJldGNoIHRoZSBib3guCiAg ICAgICAgICAgICBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveC5w YXJlbnQoKSkuc2V0SXNOb25FbXB0eSgpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0hhcmRM aW5lQnJlYWsoKSkgeworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAg aWYgKHJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgYXV0byBsaW5lQnJlYWtC b3ggPSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlTGluZUJyZWFrQm94KGxheW91dEJv eCwgbG9naWNhbExlZnQpOwogICAgICAgICAgICAgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGlu ZUJveCgqbGluZUJyZWFrQm94KTsKICAgICAgICAgICAgIGxpbmVCcmVha0JveC0+c2V0SXNOb25F bXB0eSgpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGxp bmVCcmVha0JveCkpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVu aXR5KCkpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBpZiAocnVu LmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSkgewogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxp bmVMZXZlbEJveChMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlR2VuZXJpY0lubGluZUxl dmVsQm94KGxheW91dEJveCwgbG9naWNhbExlZnQpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg fQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9CisgICAgaWYgKCFtX2lubGlu ZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQpIHsKKyAgICAgICAgcm9vdElubGluZUJv eC5zZXRMb2dpY2FsVG9wKHsgfSk7CisgICAgICAgIGxpbmVCb3guc2V0TG9naWNhbEhlaWdodChy b290SW5saW5lQm94LmxvZ2ljYWxIZWlnaHQoKSk7CiAgICAgfQogfQogCi12b2lkIExpbmVCb3hC dWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZGFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRp Y2FsbHkoTGluZUJveCYgbGluZUJveCkKK3ZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5l Qm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseShMaW5lQm94JiBsaW5l Qm94KQogewogICAgIC8vIFRoaXMgZnVuY3Rpb24gKHBhcnRpYWxseSkgaW1wbGVtZW50czoKICAg ICAvLyAyLjIuIExheW91dCBXaXRoaW4gTGluZSBCb3hlcwo= 416382 2020-12-16 19:49:45 -0800 2020-12-16 20:23:06 -0800 Patch bug-219962-20201216194944.patch text/plain 8703 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyMDI4ZjczZTQ1ZThl ODdiMjdjMTIzODNlMGFjMDFkZTRkYzgxMi4uOGNlMjcyN2Y5NzBhMGIzYTAwZWEwNjZiNWVkMGVi MzFjMmQ3MTg4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgZmFz dCBwYXRoIHZlcnRpY2FsIGFsaWdubWVudCBmb3Igbm9uLXN0cmV0Y2h5LCBiYXNlbGluZSBhbGln bmVkIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTk2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGVzdGltYXRlIHRoZSBsb2dpY2FsIHRvcCBvZiBz aW1wbGUgYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyB3aGlsZSB0aGV5IGFyZSBiZWluZyBjb25z dHJ1Y3RlZC4gSXQgaGVscHMgdG8gYXZvaWQgdGhlIHJhdGhlciBleHBlbnNpdmUKKyAgICAgICAg dGhyZWUtcGFzcyB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29kZSAoc2VlIGNvbXB1dGVMaW5lQm94SGVp Z2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSkgd2hlbiB0aGUgbGluZSBoYXMg bm90aGluZyBidXQgc3VjaCBzaW1wbGUgYm94ZXMuIAorCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpMaW5lQm94QnVpbGRlcik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVz KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5l Qm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZGFs aWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOiBEZWxldGVkLgorCiAyMDIwLTEyLTE2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRnJh bWVWaWV3OjptX2N1c3RvbVNpemVGb3JSZXNpemVFdmVudCBhbiBPcHRpb25hbDxJbnRTaXplPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAz MDAzMGY4NWQ4MGIxMzdmNmRlYTYxYTRiNDIwZmQ2ZmRlNGY1NmNmLi5iYjZmZDQyNDQ2ZGVjOTFh MGIzZjM3Nzc1NzNjNzc3NmU3MTViOGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIHZvaWQgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYpIGNvbnN0OwogICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhM aW5lQm94JiwgY29uc3QgTGluZTo6UnVuTGlzdCYpOwotICAgIHZvaWQgY29tcHV0ZUxpbmVCb3hI ZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmVCb3gmKTsKKyAgICB2 b2lkIGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxs eShMaW5lQm94Jik7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0 dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9 CiAgICAgY29uc3QgQm94JiByb290Qm94KCkgY29uc3QgeyByZXR1cm4gZm9ybWF0dGluZ0NvbnRl eHQoKS5yb290KCk7IH0KQEAgLTU4LDYgKzU4LDggQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAg ICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDsKKyAgICBib29sIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB7IGZh bHNlIH07CisgICAgYm9vbCBtX2luTm9RdWlya3NNb2RlIHsgdHJ1ZSB9OwogfTsKIAogc3RydWN0 IEhhbmdpbmdUcmFpbGluZ1doaXRlc3BhY2VDb250ZW50IHsKQEAgLTE0OCw2ICsxNTAsOSBAQCBz dGF0aWMgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFsaWdubWVudE9mZnNl dChjb25zdCBMaW5lOjpSdW5MaXN0JgogCiBMaW5lQm94QnVpbGRlcjo6TGluZUJveEJ1aWxkZXIo Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQog ICAgIDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkK KyAgICAvLyBGSVhNRTogbGluZS1oZWlnaHQgc2hvdWxkIG5vdCByZXF1aXJlIGNvbXBsZXggYWxp Z25tZW50IGluIHNpbXBsZSBjYXNlcy4KKyAgICAsIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0 aWNhbEFsaWdubWVudCghcm9vdEJveCgpLnN0eWxlKCkubGluZUhlaWdodCgpLmlzTmVnYXRpdmUo KSkKKyAgICAsIG1faW5Ob1F1aXJrc01vZGUoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQubGF5b3V0 U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpKQogewogfQogCkBAIC0xNjIsNyArMTY3LDggQEAgTGlu ZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50 JiBsaW5lQ29udGVudCkKICAgICBpZiAoYXV0byBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0g TGF5b3V0Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgp LnRleHRBbGlnbigpLCBsaW5lTG9naWNhbFdpZHRoLCBjb250ZW50TG9naWNhbFdpZHRoLCBsaW5l Q29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpKQogICAgICAgICBsaW5lQm94LnNl dEhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoKmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQpOwog ICAgIGNvbnN0cnVjdElubGluZUxldmVsQm94ZXMobGluZUJveCwgcnVucyk7Ci0gICAgY29tcHV0 ZUxpbmVCb3hIZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KGxpbmVCb3gp OworICAgIGlmIChtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQpCisgICAg ICAgIGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxs eShsaW5lQm94KTsKICAgICByZXR1cm4gbGluZUJveDsKIH0KIApAQCAtMjAzLDYgKzIwOSw3IEBA IHZvaWQgTGluZUJveEJ1aWxkZXI6OnNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goTGlu ZUJveDo6SW5saW5lTGV2ZWxCb3gmIGluCiB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJ bmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1 bnMpCiB7CiAgICAgYXV0byBob3Jpem9udGFsQWxpZ21lbnRPZmZzZXQgPSBsaW5lQm94Lmhvcml6 b250YWxBbGlnbm1lbnRPZmZzZXQoKS52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KTsKKyAg ICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgPSBydW5zLmlzRW1wdHko KTsKIAogICAgIGF1dG8gY3JlYXRlUm9vdElubGluZUJveCA9IFsmXSB7CiAgICAgICAgIGF1dG8g cm9vdElubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVSb290SW5saW5l Qm94KHJvb3RCb3goKSwgaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0LCBsaW5lQm94LmxvZ2ljYWxX aWR0aCgpKTsKQEAgLTI1MSw3ICsyNTgsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAg ICAgICB9CiAgICAgfTsKICAgICBjcmVhdGVXcmFwcGVkSW5saW5lQm94ZXMoKTsKLQorICAgIGF1 dG8mIHJvb3RJbmxpbmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKICAgICBmb3IgKGF1 dG8mIHJ1biA6IHJ1bnMpIHsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxheW91dEJv eCgpOwogICAgICAgICBhdXRvIGxvZ2ljYWxMZWZ0ID0gaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0 ICsgcnVuLmxvZ2ljYWxMZWZ0KCk7CkBAIC0yNzUsMzQgKzI4Miw2OCBAQCB2b2lkIExpbmVCb3hC dWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0 IExpbmU6OlJ1bgogICAgICAgICAgICAgLy8gbGV2ZWwgYm94IGNvbnRyaWJ1dGVzIDBweCB0byB0 aGUgbGluZSBib3ggaGVpZ2h0LCBpdCBzaG91bGQgbm90IGJlIGNvbnNpZGVyZWQgZW1wdHkuCiAg ICAgICAgICAgICBpZiAobWFyZ2luQm94SGVpZ2h0IHx8IGlubGluZUxldmVsQm94R2VvbWV0cnku bWFyZ2luQmVmb3JlKCkgfHwgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpKQog ICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7Cisg ICAgICAgICAgICAvLyBMZXQncyBlc3RpbWF0ZSB0aGUgbG9naWNhbCB0b3Agc28gdGhhdCB3ZSBj YW4gYXZvaWQgcnVubmluZyB0aGUgYWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUgYm94ZXMuCisg ICAgICAgICAgICBhdXRvIGFsaWduSW5saW5lQm94SWZFbGlnaWJsZSA9IFsmXSB7CisgICAgICAg ICAgICAgICAgaWYgKG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB8fCAh bV9pbk5vUXVpcmtzTW9kZSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg ICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1zdHJldGNoeSBkaXJlY3QgY2hpbGRyZW4g YXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBub3cuCisgICAgICAgICAgICAgICAgYXV0 byBpc0NvbnNpZGVyZWRTaW1wbGUgPSAmbGF5b3V0Qm94LnBhcmVudCgpID09ICZyb290Qm94KCkK KyAgICAgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94LnN0eWxlKCkudmVydGljYWxBbGlnbigp ID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCisgICAgICAgICAgICAgICAgICAgICYmICFpbmxp bmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpCisgICAgICAgICAgICAgICAgICAgICYm ICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCkKKyAgICAgICAgICAgICAgICAg ICAgJiYgbWFyZ2luQm94SGVpZ2h0IDw9IHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKTsKKyAgICAg ICAgICAgICAgICBpZiAoIWlzQ29uc2lkZXJlZFNpbXBsZSkgeworICAgICAgICAgICAgICAgICAg ICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgPSB0cnVlOworICAgICAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMb2dpY2FsVG9wKHJvb3RJbmxpbmVCb3guYmFzZWxp bmUoKSAtIGFzY2VudCk7CisgICAgICAgICAgICB9OworICAgICAgICAgICAgYWxpZ25JbmxpbmVC b3hJZkVsaWdpYmxlKCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdU Rk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKLSAgICAgICAgfSBlbHNlIGlmIChydW4uaXNJ bmxpbmVCb3hTdGFydCgpKSB7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAg ICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIHNpbXBsZSBpbmxpbmUgYm94ZXMgdG9vLgor ICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgPSB0cnVlOwor ICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewogICAgICAgICAgICAgYXV0byBp bml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2Fs TGVmdCgpOwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7CiAg ICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVh dGVJbmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgaW5pdGlhbExvZ2ljYWxXaWR0aCk7 CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KCppbmxpbmVCb3gp OwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJv eCkpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0lubGluZUJveEVuZCgpKSB7CisgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94RW5k KCkpIHsKICAgICAgICAgICAgIC8vIEFkanVzdCB0aGUgbG9naWNhbCB3aWR0aCB3aGVuIHRoZSBp bmxpbmUgbGV2ZWwgY29udGFpbmVyIGNsb3NlcyBvbiB0aGlzIGxpbmUuCiAgICAgICAgICAgICBh dXRvJiBpbmxpbmVCb3ggPSBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91 dEJveCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94LmlzSW5saW5lQm94KCkpOwogICAg ICAgICAgICAgaW5saW5lQm94LnNldExvZ2ljYWxXaWR0aChydW4ubG9naWNhbFJpZ2h0KCkgLSBp bmxpbmVCb3gubG9naWNhbExlZnQoKSk7Ci0gICAgICAgIH0gZWxzZSBpZiAocnVuLmlzVGV4dCgp IHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSkgeworICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgIH0KKyAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4uaXNTb2Z0TGluZUJyZWFrKCkp IHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBBZGp1c3Qgbm9uLWVtcHR5IGlubGluZSBib3ggaGVp Z2h0IHdoZW4gZ2x5cGhzIGZyb20gdGhlIG5vbi1wcmltYXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94 LgogICAgICAgICAgICAgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChsYXlvdXRC b3gucGFyZW50KCkpLnNldElzTm9uRW1wdHkoKTsKLSAgICAgICAgfSBlbHNlIGlmIChydW4uaXNI YXJkTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAg ICAgIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIGF1dG8gbGluZUJy ZWFrQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxpbmVCcmVha0JveChsYXlv dXRCb3gsIGxvZ2ljYWxMZWZ0KTsKICAgICAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJ bmxpbmVCb3goKmxpbmVCcmVha0JveCk7CiAgICAgICAgICAgICBsaW5lQnJlYWtCb3gtPnNldElz Tm9uRW1wdHkoKTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92 ZShsaW5lQnJlYWtCb3gpKTsKLSAgICAgICAgfSBlbHNlIGlmIChydW4uaXNXb3JkQnJlYWtPcHBv cnR1bml0eSgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYg KHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpIHsKICAgICAgICAgICAgIGxpbmVCb3guYWRk SW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxp bmVMZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KSk7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfQorICAgIGlmICghbV9p bmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KSB7CisgICAgICAgIHJvb3RJbmxp bmVCb3guc2V0TG9naWNhbFRvcCh7IH0pOworICAgICAgICBsaW5lQm94LnNldExvZ2ljYWxIZWln aHQocm9vdElubGluZUJveC5sb2dpY2FsSGVpZ2h0KCkpOwogICAgIH0KIH0KIAotdm9pZCBMaW5l Qm94QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNW ZXJ0aWNhbGx5KExpbmVCb3gmIGxpbmVCb3gpCit2b2lkIExpbmVCb3hCdWlsZGVyOjpjb21wdXRl TGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkoTGluZUJveCYg bGluZUJveCkKIHsKICAgICAvLyBUaGlzIGZ1bmN0aW9uIChwYXJ0aWFsbHkpIGltcGxlbWVudHM6 CiAgICAgLy8gMi4yLiBMYXlvdXQgV2l0aGluIExpbmUgQm94ZXMK 416385 2020-12-16 20:23:08 -0800 2020-12-17 10:11:33 -0800 Patch bug-219962-20201216202307.patch text/plain 8727 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyMDI4ZjczZTQ1ZThl ODdiMjdjMTIzODNlMGFjMDFkZTRkYzgxMi4uOGNlMjcyN2Y5NzBhMGIzYTAwZWEwNjZiNWVkMGVi MzFjMmQ3MTg4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgZmFz dCBwYXRoIHZlcnRpY2FsIGFsaWdubWVudCBmb3Igbm9uLXN0cmV0Y2h5LCBiYXNlbGluZSBhbGln bmVkIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTk2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGVzdGltYXRlIHRoZSBsb2dpY2FsIHRvcCBvZiBz aW1wbGUgYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyB3aGlsZSB0aGV5IGFyZSBiZWluZyBjb25z dHJ1Y3RlZC4gSXQgaGVscHMgdG8gYXZvaWQgdGhlIHJhdGhlciBleHBlbnNpdmUKKyAgICAgICAg dGhyZWUtcGFzcyB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29kZSAoc2VlIGNvbXB1dGVMaW5lQm94SGVp Z2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSkgd2hlbiB0aGUgbGluZSBoYXMg bm90aGluZyBidXQgc3VjaCBzaW1wbGUgYm94ZXMuIAorCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpMaW5lQm94QnVpbGRlcik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVz KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5l Qm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZGFs aWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOiBEZWxldGVkLgorCiAyMDIwLTEyLTE2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRnJh bWVWaWV3OjptX2N1c3RvbVNpemVGb3JSZXNpemVFdmVudCBhbiBPcHRpb25hbDxJbnRTaXplPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAz MDAzMGY4NWQ4MGIxMzdmNmRlYTYxYTRiNDIwZmQ2ZmRlNGY1NmNmLi4xYTgxNmQ1MjQyYmJjOGVk ZDYyNjVmMTAwNzYzZThkMjEyMjNkZmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIHZvaWQgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYpIGNvbnN0OwogICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhM aW5lQm94JiwgY29uc3QgTGluZTo6UnVuTGlzdCYpOwotICAgIHZvaWQgY29tcHV0ZUxpbmVCb3hI ZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmVCb3gmKTsKKyAgICB2 b2lkIGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxs eShMaW5lQm94Jik7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0 dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9 CiAgICAgY29uc3QgQm94JiByb290Qm94KCkgY29uc3QgeyByZXR1cm4gZm9ybWF0dGluZ0NvbnRl eHQoKS5yb290KCk7IH0KQEAgLTU4LDYgKzU4LDcgQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAg ICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDsKKyAgICBib29sIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB7IGZh bHNlIH07CiB9OwogCiBzdHJ1Y3QgSGFuZ2luZ1RyYWlsaW5nV2hpdGVzcGFjZUNvbnRlbnQgewpA QCAtMTQ4LDYgKzE0OSw4IEBAIHN0YXRpYyBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jp em9udGFsQWxpZ25tZW50T2Zmc2V0KGNvbnN0IExpbmU6OlJ1bkxpc3QmCiAKIExpbmVCb3hCdWls ZGVyOjpMaW5lQm94QnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQpCiAgICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGlu ZUZvcm1hdHRpbmdDb250ZXh0KQorICAgIC8vIEZJWE1FOiBsaW5lLWhlaWdodCBzaG91bGQgbm90 IHJlcXVpcmUgY29tcGxleCBhbGlnbm1lbnQgaW4gc2ltcGxlIGNhc2VzLgorICAgICwgbV9pbmxp bmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KCFyb290Qm94KCkuc3R5bGUoKS5saW5l SGVpZ2h0KCkuaXNOZWdhdGl2ZSgpIHx8ICFpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRT dGF0ZSgpLmluTm9RdWlya3NNb2RlKCkpCiB7CiB9CiAKQEAgLTE2Miw3ICsxNjUsOCBAQCBMaW5l Qm94IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQm IGxpbmVDb250ZW50KQogICAgIGlmIChhdXRvIGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgPSBM YXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCku dGV4dEFsaWduKCksIGxpbmVMb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVD b250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkpCiAgICAgICAgIGxpbmVCb3guc2V0 SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgqaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCk7CiAg ICAgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBydW5zKTsKLSAgICBjb21wdXRl TGluZUJveEhlaWdodEFuZGFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkobGluZUJveCk7 CisgICAgaWYgKG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkKKyAgICAg ICAgY29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5 KGxpbmVCb3gpOwogICAgIHJldHVybiBsaW5lQm94OwogfQogCkBAIC0yMDMsNiArMjA3LDggQEAg dm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5l Qm94OjpJbmxpbmVMZXZlbEJveCYgaW4KIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElu bGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVu cykKIHsKICAgICBhdXRvIGhvcml6b250YWxBbGlnbWVudE9mZnNldCA9IGxpbmVCb3guaG9yaXpv bnRhbEFsaWdubWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pOworICAg IC8vIEVtcHR5IHJvb3QgaW5saW5lIGJveGVzIHJlcXVpcmUgc3BlY2lhbCBjb2xsYXBzaW5nLgor ICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCA9IG1faW5saW5lTGV2 ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB8fCBydW5zLmlzRW1wdHkoKTsKIAogICAgIGF1 dG8gY3JlYXRlUm9vdElubGluZUJveCA9IFsmXSB7CiAgICAgICAgIGF1dG8gcm9vdElubGluZUJv eCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVSb290SW5saW5lQm94KHJvb3RCb3go KSwgaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKTsKQEAg LTI1MSw3ICsyNTcsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZl bEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICB9CiAgICAg fTsKICAgICBjcmVhdGVXcmFwcGVkSW5saW5lQm94ZXMoKTsKLQorICAgIGF1dG8mIHJvb3RJbmxp bmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKICAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1 bnMpIHsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxheW91dEJveCgpOwogICAgICAg ICBhdXRvIGxvZ2ljYWxMZWZ0ID0gaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0ICsgcnVuLmxvZ2lj YWxMZWZ0KCk7CkBAIC0yNzUsMzQgKzI4MSw2OCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgog ICAgICAgICAgICAgLy8gbGV2ZWwgYm94IGNvbnRyaWJ1dGVzIDBweCB0byB0aGUgbGluZSBib3gg aGVpZ2h0LCBpdCBzaG91bGQgbm90IGJlIGNvbnNpZGVyZWQgZW1wdHkuCiAgICAgICAgICAgICBp ZiAobWFyZ2luQm94SGVpZ2h0IHx8IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3Jl KCkgfHwgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpKQogICAgICAgICAgICAg ICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7CisgICAgICAgICAgICAv LyBMZXQncyBlc3RpbWF0ZSB0aGUgbG9naWNhbCB0b3Agc28gdGhhdCB3ZSBjYW4gYXZvaWQgcnVu bmluZyB0aGUgYWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUgYm94ZXMuCisgICAgICAgICAgICBh dXRvIGFsaWduSW5saW5lQm94SWZFbGlnaWJsZSA9IFsmXSB7CisgICAgICAgICAgICAgICAgaWYg KG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1z dHJldGNoeSBkaXJlY3QgY2hpbGRyZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBu b3cuCisgICAgICAgICAgICAgICAgYXV0byBpc0NvbnNpZGVyZWRTaW1wbGUgPSAmbGF5b3V0Qm94 LnBhcmVudCgpID09ICZyb290Qm94KCkKKyAgICAgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94 LnN0eWxlKCkudmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCisgICAg ICAgICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgp CisgICAgICAgICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkFm dGVyKCkKKyAgICAgICAgICAgICAgICAgICAgJiYgbWFyZ2luQm94SGVpZ2h0IDw9IHJvb3RJbmxp bmVCb3guYmFzZWxpbmUoKTsKKyAgICAgICAgICAgICAgICBpZiAoIWlzQ29uc2lkZXJlZFNpbXBs ZSkgeworICAgICAgICAgICAgICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxB bGlnbm1lbnQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMb2dpY2Fs VG9wKHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKSAtIGFzY2VudCk7CisgICAgICAgICAgICB9Owor ICAgICAgICAgICAgYWxpZ25JbmxpbmVCb3hJZkVsaWdpYmxlKCk7CiAgICAgICAgICAgICBsaW5l Qm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKLSAg ICAgICAgfSBlbHNlIGlmIChydW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7CisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgfQorICAgICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIHNp bXBsZSBpbmxpbmUgYm94ZXMgdG9vLgorICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVy dGljYWxBbGlnbm1lbnQgPSB0cnVlOworICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQo KSkgewogICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dp Y2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgQVNTRVJUKGluaXRp YWxMb2dpY2FsV2lkdGggPj0gMCk7CiAgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVC b3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVm dCwgaW5pdGlhbExvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5 Rm9ySW5saW5lQm94KCppbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVM ZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0lu bGluZUJveEVuZCgpKSB7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAg ICBpZiAocnVuLmlzSW5saW5lQm94RW5kKCkpIHsKICAgICAgICAgICAgIC8vIEFkanVzdCB0aGUg bG9naWNhbCB3aWR0aCB3aGVuIHRoZSBpbmxpbmUgbGV2ZWwgY29udGFpbmVyIGNsb3NlcyBvbiB0 aGlzIGxpbmUuCiAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3ggPSBsaW5lQm94LmlubGluZUxl dmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5saW5l Qm94LmlzSW5saW5lQm94KCkpOwogICAgICAgICAgICAgaW5saW5lQm94LnNldExvZ2ljYWxXaWR0 aChydW4ubG9naWNhbFJpZ2h0KCkgLSBpbmxpbmVCb3gubG9naWNhbExlZnQoKSk7Ci0gICAgICAg IH0gZWxzZSBpZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSkgeworICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSB8 fCBydW4uaXNTb2Z0TGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBBZGp1c3Qg bm9uLWVtcHR5IGlubGluZSBib3ggaGVpZ2h0IHdoZW4gZ2x5cGhzIGZyb20gdGhlIG5vbi1wcmlt YXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94LgogICAgICAgICAgICAgbGluZUJveC5pbmxpbmVMZXZl bEJveEZvckxheW91dEJveChsYXlvdXRCb3gucGFyZW50KCkpLnNldElzTm9uRW1wdHkoKTsKLSAg ICAgICAgfSBlbHNlIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICB9CisgICAgICAgIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsK ICAgICAgICAgICAgIGF1dG8gbGluZUJyZWFrQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6 OmNyZWF0ZUxpbmVCcmVha0JveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KTsKICAgICAgICAgICAg IHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goKmxpbmVCcmVha0JveCk7CiAgICAgICAg ICAgICBsaW5lQnJlYWtCb3gtPnNldElzTm9uRW1wdHkoKTsKICAgICAgICAgICAgIGxpbmVCb3gu YWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKLSAgICAgICAgfSBlbHNl IGlmIChydW4uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKQorICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIH0KKyAgICAgICAgaWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpIHsK ICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2 ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0 KSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgfQorICAgIGlmICghbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25t ZW50KSB7CisgICAgICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNhbFRvcCh7IH0pOworICAgICAg ICBsaW5lQm94LnNldExvZ2ljYWxIZWlnaHQocm9vdElubGluZUJveC5sb2dpY2FsSGVpZ2h0KCkp OwogICAgIH0KIH0KIAotdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWlnaHRB bmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmVCb3gmIGxpbmVCb3gpCit2b2lk IExpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxC b3hlc1ZlcnRpY2FsbHkoTGluZUJveCYgbGluZUJveCkKIHsKICAgICAvLyBUaGlzIGZ1bmN0aW9u IChwYXJ0aWFsbHkpIGltcGxlbWVudHM6CiAgICAgLy8gMi4yLiBMYXlvdXQgV2l0aGluIExpbmUg Qm94ZXMK 416435 2020-12-17 10:11:35 -0800 2020-12-18 21:27:47 -0800 Patch bug-219962-20201217101134.patch text/plain 8735 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyMDI4ZjczZTQ1ZThl ODdiMjdjMTIzODNlMGFjMDFkZTRkYzgxMi4uOWQxODlkNTk2MTVmOWUwMGQ0MWI3MDg5NjQ2Y2Jk NDgxMzMwNTU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgZmFz dCBwYXRoIHZlcnRpY2FsIGFsaWdubWVudCBmb3Igbm9uLXN0cmV0Y2h5LCBiYXNlbGluZSBhbGln bmVkIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTk2MgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgorCisgICAgICAgIExldCdzIGVzdGltYXRlIHRoZSBsb2dpY2FsIHRvcCBvZiBz aW1wbGUgYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyB3aGlsZSB0aGV5IGFyZSBiZWluZyBjb25z dHJ1Y3RlZC4gSXQgaGVscHMgdG8gYXZvaWQgdGhlIHJhdGhlciBleHBlbnNpdmUKKyAgICAgICAg dGhyZWUtcGFzcyB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29kZSAoc2VlIGNvbXB1dGVMaW5lQm94SGVp Z2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSkgd2hlbiB0aGUgbGluZSBoYXMg bm90aGluZyBidXQgc3VjaCBzaW1wbGUgYm94ZXMuIAorCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpMaW5lQm94QnVpbGRlcik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVz KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5l Qm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZGFs aWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOiBEZWxldGVkLgorCiAyMDIwLTEyLTE2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRnJh bWVWaWV3OjptX2N1c3RvbVNpemVGb3JSZXNpemVFdmVudCBhbiBPcHRpb25hbDxJbnRTaXplPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAz MDAzMGY4NWQ4MGIxMzdmNmRlYTYxYTRiNDIwZmQ2ZmRlNGY1NmNmLi44MThlMmYzYjExNzlhNWUw ZjhkNzY4MDM3YTg1ZDk3NWUwOTY4MzcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIHZvaWQgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYpIGNvbnN0OwogICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhM aW5lQm94JiwgY29uc3QgTGluZTo6UnVuTGlzdCYpOwotICAgIHZvaWQgY29tcHV0ZUxpbmVCb3hI ZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmVCb3gmKTsKKyAgICB2 b2lkIGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxs eShMaW5lQm94Jik7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0 dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9 CiAgICAgY29uc3QgQm94JiByb290Qm94KCkgY29uc3QgeyByZXR1cm4gZm9ybWF0dGluZ0NvbnRl eHQoKS5yb290KCk7IH0KQEAgLTU4LDYgKzU4LDcgQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAg ICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDsKKyAgICBib29sIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB7IGZh bHNlIH07CiB9OwogCiBzdHJ1Y3QgSGFuZ2luZ1RyYWlsaW5nV2hpdGVzcGFjZUNvbnRlbnQgewpA QCAtMTQ4LDYgKzE0OSw4IEBAIHN0YXRpYyBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jp em9udGFsQWxpZ25tZW50T2Zmc2V0KGNvbnN0IExpbmU6OlJ1bkxpc3QmCiAKIExpbmVCb3hCdWls ZGVyOjpMaW5lQm94QnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQpCiAgICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGlu ZUZvcm1hdHRpbmdDb250ZXh0KQorICAgIC8vIEZJWE1FOiBsaW5lLWhlaWdodCBzaG91bGQgbm90 IHJlcXVpcmUgY29tcGxleCBhbGlnbm1lbnQgaW4gc2ltcGxlIGNhc2VzLgorICAgICwgbV9pbmxp bmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KCFyb290Qm94KCkuc3R5bGUoKS5saW5l SGVpZ2h0KCkuaXNOZWdhdGl2ZSgpIHx8ICFpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRT dGF0ZSgpLmluTm9RdWlya3NNb2RlKCkpCiB7CiB9CiAKQEAgLTE2Miw3ICsxNjUsOCBAQCBMaW5l Qm94IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQm IGxpbmVDb250ZW50KQogICAgIGlmIChhdXRvIGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgPSBM YXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCku dGV4dEFsaWduKCksIGxpbmVMb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVD b250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkpCiAgICAgICAgIGxpbmVCb3guc2V0 SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgqaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCk7CiAg ICAgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBydW5zKTsKLSAgICBjb21wdXRl TGluZUJveEhlaWdodEFuZGFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkobGluZUJveCk7 CisgICAgaWYgKG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkKKyAgICAg ICAgY29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5 KGxpbmVCb3gpOwogICAgIHJldHVybiBsaW5lQm94OwogfQogCkBAIC0yMDMsNiArMjA3LDggQEAg dm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5l Qm94OjpJbmxpbmVMZXZlbEJveCYgaW4KIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElu bGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVu cykKIHsKICAgICBhdXRvIGhvcml6b250YWxBbGlnbWVudE9mZnNldCA9IGxpbmVCb3guaG9yaXpv bnRhbEFsaWdubWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pOworICAg IC8vIEVtcHR5IHJvb3QgaW5saW5lIGJveGVzIHJlcXVpcmUgc3BlY2lhbCBjb2xsYXBzaW5nLgor ICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCA9IG1faW5saW5lTGV2 ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB8fCBydW5zLmlzRW1wdHkoKTsKIAogICAgIGF1 dG8gY3JlYXRlUm9vdElubGluZUJveCA9IFsmXSB7CiAgICAgICAgIGF1dG8gcm9vdElubGluZUJv eCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVSb290SW5saW5lQm94KHJvb3RCb3go KSwgaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKTsKQEAg LTI1MSw3ICsyNTcsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZl bEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICB9CiAgICAg fTsKICAgICBjcmVhdGVXcmFwcGVkSW5saW5lQm94ZXMoKTsKLQorICAgIGF1dG8mIHJvb3RJbmxp bmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKICAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1 bnMpIHsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxheW91dEJveCgpOwogICAgICAg ICBhdXRvIGxvZ2ljYWxMZWZ0ID0gaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0ICsgcnVuLmxvZ2lj YWxMZWZ0KCk7CkBAIC0yNzUsMzQgKzI4MSw2OCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgog ICAgICAgICAgICAgLy8gbGV2ZWwgYm94IGNvbnRyaWJ1dGVzIDBweCB0byB0aGUgbGluZSBib3gg aGVpZ2h0LCBpdCBzaG91bGQgbm90IGJlIGNvbnNpZGVyZWQgZW1wdHkuCiAgICAgICAgICAgICBp ZiAobWFyZ2luQm94SGVpZ2h0IHx8IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3Jl KCkgfHwgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpKQogICAgICAgICAgICAg ICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7CisgICAgICAgICAgICAv LyBMZXQncyBlc3RpbWF0ZSB0aGUgbG9naWNhbCB0b3Agc28gdGhhdCB3ZSBjYW4gYXZvaWQgcnVu bmluZyB0aGUgYWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUgYm94ZXMuCisgICAgICAgICAgICBh dXRvIGFsaWduSW5saW5lQm94SWZFbGlnaWJsZSA9IFsmXSB7CisgICAgICAgICAgICAgICAgaWYg KG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1z dHJldGNoeSBkaXJlY3QgY2hpbGRyZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBu b3cuCisgICAgICAgICAgICAgICAgYXV0byBpc0NvbnNpZGVyZWRTaW1wbGUgPSAmbGF5b3V0Qm94 LnBhcmVudCgpID09ICZyb290Qm94KCkKKyAgICAgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94 LnN0eWxlKCkudmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCisgICAg ICAgICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgp CisgICAgICAgICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkFm dGVyKCkKKyAgICAgICAgICAgICAgICAgICAgJiYgbWFyZ2luQm94SGVpZ2h0IDw9IHJvb3RJbmxp bmVCb3guYmFzZWxpbmUoKTsKKyAgICAgICAgICAgICAgICBpZiAoIWlzQ29uc2lkZXJlZFNpbXBs ZSkgeworICAgICAgICAgICAgICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxB bGlnbm1lbnQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMb2dpY2Fs VG9wKHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKSAtIGFzY2VudCk7CisgICAgICAgICAgICB9Owor ICAgICAgICAgICAgYWxpZ25JbmxpbmVCb3hJZkVsaWdpYmxlKCk7CiAgICAgICAgICAgICBsaW5l Qm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKLSAg ICAgICAgfSBlbHNlIGlmIChydW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7CisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgfQorICAgICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIHNp bXBsZSBpbmxpbmUgYm94ZXMgdG9vLgorICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVy dGljYWxBbGlnbm1lbnQgPSB0cnVlOworICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQo KSkgewogICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dp Y2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgQVNTRVJUKGluaXRp YWxMb2dpY2FsV2lkdGggPj0gMCk7CiAgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVC b3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVm dCwgaW5pdGlhbExvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5 Rm9ySW5saW5lQm94KCppbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVM ZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0lu bGluZUJveEVuZCgpKSB7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAg ICBpZiAocnVuLmlzSW5saW5lQm94RW5kKCkpIHsKICAgICAgICAgICAgIC8vIEFkanVzdCB0aGUg bG9naWNhbCB3aWR0aCB3aGVuIHRoZSBpbmxpbmUgbGV2ZWwgY29udGFpbmVyIGNsb3NlcyBvbiB0 aGlzIGxpbmUuCiAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3ggPSBsaW5lQm94LmlubGluZUxl dmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5saW5l Qm94LmlzSW5saW5lQm94KCkpOwogICAgICAgICAgICAgaW5saW5lQm94LnNldExvZ2ljYWxXaWR0 aChydW4ubG9naWNhbFJpZ2h0KCkgLSBpbmxpbmVCb3gubG9naWNhbExlZnQoKSk7Ci0gICAgICAg IH0gZWxzZSBpZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSkgeworICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSB8 fCBydW4uaXNTb2Z0TGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBBZGp1c3Qg bm9uLWVtcHR5IGlubGluZSBib3ggaGVpZ2h0IHdoZW4gZ2x5cGhzIGZyb20gdGhlIG5vbi1wcmlt YXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94LgogICAgICAgICAgICAgbGluZUJveC5pbmxpbmVMZXZl bEJveEZvckxheW91dEJveChsYXlvdXRCb3gucGFyZW50KCkpLnNldElzTm9uRW1wdHkoKTsKLSAg ICAgICAgfSBlbHNlIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICB9CisgICAgICAgIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsK ICAgICAgICAgICAgIGF1dG8gbGluZUJyZWFrQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6 OmNyZWF0ZUxpbmVCcmVha0JveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KTsKICAgICAgICAgICAg IHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goKmxpbmVCcmVha0JveCk7CiAgICAgICAg ICAgICBsaW5lQnJlYWtCb3gtPnNldElzTm9uRW1wdHkoKTsKICAgICAgICAgICAgIGxpbmVCb3gu YWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKLSAgICAgICAgfSBlbHNl IGlmIChydW4uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKQorICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIH0KKyAgICAgICAgaWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpIHsK ICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2 ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0 KSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgfQorICAgIGlmICghbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25t ZW50KSB7CisgICAgICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNhbFRvcCh7IH0pOworICAgICAg ICBsaW5lQm94LnNldExvZ2ljYWxIZWlnaHQocm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5o ZWlnaHQoKSk7CiAgICAgfQogfQogCi12b2lkIExpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJv eEhlaWdodEFuZGFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkoTGluZUJveCYgbGluZUJv eCkKK3ZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25Jbmxp bmVMZXZlbEJveGVzVmVydGljYWxseShMaW5lQm94JiBsaW5lQm94KQogewogICAgIC8vIFRoaXMg ZnVuY3Rpb24gKHBhcnRpYWxseSkgaW1wbGVtZW50czoKICAgICAvLyAyLjIuIExheW91dCBXaXRo aW4gTGluZSBCb3hlcwo= 416567 2020-12-18 21:27:49 -0800 2020-12-19 05:16:29 -0800 Patch bug-219962-20201218212748.patch text/plain 9239 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyMDI4ZjczZTQ1ZThl ODdiMjdjMTIzODNlMGFjMDFkZTRkYzgxMi4uOWQxODlkNTk2MTVmOWUwMGQ0MWI3MDg5NjQ2Y2Jk NDgxMzMwNTU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgZmFz dCBwYXRoIHZlcnRpY2FsIGFsaWdubWVudCBmb3Igbm9uLXN0cmV0Y2h5LCBiYXNlbGluZSBhbGln bmVkIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTk2MgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgorCisgICAgICAgIExldCdzIGVzdGltYXRlIHRoZSBsb2dpY2FsIHRvcCBvZiBz aW1wbGUgYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyB3aGlsZSB0aGV5IGFyZSBiZWluZyBjb25z dHJ1Y3RlZC4gSXQgaGVscHMgdG8gYXZvaWQgdGhlIHJhdGhlciBleHBlbnNpdmUKKyAgICAgICAg dGhyZWUtcGFzcyB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29kZSAoc2VlIGNvbXB1dGVMaW5lQm94SGVp Z2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSkgd2hlbiB0aGUgbGluZSBoYXMg bm90aGluZyBidXQgc3VjaCBzaW1wbGUgYm94ZXMuIAorCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpMaW5lQm94QnVpbGRlcik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVz KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5l Qm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZGFs aWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOiBEZWxldGVkLgorCiAyMDIwLTEyLTE2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRnJh bWVWaWV3OjptX2N1c3RvbVNpemVGb3JSZXNpemVFdmVudCBhbiBPcHRpb25hbDxJbnRTaXplPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAz MDAzMGY4NWQ4MGIxMzdmNmRlYTYxYTRiNDIwZmQ2ZmRlNGY1NmNmLi41MmMxNGFiNTk5OWM5ZGU3 NGEwMGExZWZmZmE5NDI3MGIwYTg4MTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIHZvaWQgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYpIGNvbnN0OwogICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhM aW5lQm94JiwgY29uc3QgTGluZTo6UnVuTGlzdCYpOwotICAgIHZvaWQgY29tcHV0ZUxpbmVCb3hI ZWlnaHRBbmRhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmVCb3gmKTsKKyAgICB2 b2lkIGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxs eShMaW5lQm94Jik7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0 dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9 CiAgICAgY29uc3QgQm94JiByb290Qm94KCkgY29uc3QgeyByZXR1cm4gZm9ybWF0dGluZ0NvbnRl eHQoKS5yb290KCk7IH0KQEAgLTU4LDYgKzU4LDcgQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAg ICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDsKKyAgICBib29sIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB7IGZh bHNlIH07CiB9OwogCiBzdHJ1Y3QgSGFuZ2luZ1RyYWlsaW5nV2hpdGVzcGFjZUNvbnRlbnQgewpA QCAtMTQ4LDYgKzE0OSw4IEBAIHN0YXRpYyBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jp em9udGFsQWxpZ25tZW50T2Zmc2V0KGNvbnN0IExpbmU6OlJ1bkxpc3QmCiAKIExpbmVCb3hCdWls ZGVyOjpMaW5lQm94QnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQpCiAgICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGlu ZUZvcm1hdHRpbmdDb250ZXh0KQorICAgIC8vIEZJWE1FOiBsaW5lLWhlaWdodCBzaG91bGQgbm90 IHJlcXVpcmUgY29tcGxleCBhbGlnbm1lbnQgaW4gc2ltcGxlIGNhc2VzLgorICAgICwgbV9pbmxp bmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KCFyb290Qm94KCkuc3R5bGUoKS5saW5l SGVpZ2h0KCkuaXNOZWdhdGl2ZSgpIHx8ICFpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRT dGF0ZSgpLmluTm9RdWlya3NNb2RlKCkpCiB7CiB9CiAKQEAgLTE2Miw3ICsxNjUsOCBAQCBMaW5l Qm94IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQm IGxpbmVDb250ZW50KQogICAgIGlmIChhdXRvIGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgPSBM YXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCku dGV4dEFsaWduKCksIGxpbmVMb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVD b250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkpCiAgICAgICAgIGxpbmVCb3guc2V0 SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgqaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCk7CiAg ICAgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBydW5zKTsKLSAgICBjb21wdXRl TGluZUJveEhlaWdodEFuZGFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkobGluZUJveCk7 CisgICAgaWYgKG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkKKyAgICAg ICAgY29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5 KGxpbmVCb3gpOwogICAgIHJldHVybiBsaW5lQm94OwogfQogCkBAIC0yMDMsNiArMjA3LDggQEAg dm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5l Qm94OjpJbmxpbmVMZXZlbEJveCYgaW4KIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElu bGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVu cykKIHsKICAgICBhdXRvIGhvcml6b250YWxBbGlnbWVudE9mZnNldCA9IGxpbmVCb3guaG9yaXpv bnRhbEFsaWdubWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pOworICAg IC8vIEVtcHR5IHJvb3QgaW5saW5lIGJveGVzIHJlcXVpcmUgc3BlY2lhbCBjb2xsYXBzaW5nLgor ICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCA9IG1faW5saW5lTGV2 ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB8fCBydW5zLmlzRW1wdHkoKTsKIAogICAgIGF1 dG8gY3JlYXRlUm9vdElubGluZUJveCA9IFsmXSB7CiAgICAgICAgIGF1dG8gcm9vdElubGluZUJv eCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVSb290SW5saW5lQm94KHJvb3RCb3go KSwgaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKTsKQEAg LTIxMiw2ICsyMTgsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZl bEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICBpZiAoaXNJ bml0aWFsbHlDb25zaWRlcmVkTm9uRW1wdHkpCiAgICAgICAgICAgICByb290SW5saW5lQm94LT5z ZXRJc05vbkVtcHR5KCk7CiAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3go KnJvb3RJbmxpbmVCb3gpOworICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxB bGlnbm1lbnQgPSBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgfHwgcm9v dElubGluZUJveC0+YmFzZWxpbmUoKSAhPSByb290SW5saW5lQm94LT5sYXlvdXRCb3VuZHMoKS5h c2NlbnQ7CiAgICAgICAgIGxpbmVCb3guYWRkUm9vdElubGluZUJveChXVEZNb3ZlKHJvb3RJbmxp bmVCb3gpKTsKICAgICB9OwogICAgIGNyZWF0ZVJvb3RJbmxpbmVCb3goKTsKQEAgLTI1MSw3ICsy NTgsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExp bmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICB9CiAgICAgfTsKICAgICBj cmVhdGVXcmFwcGVkSW5saW5lQm94ZXMoKTsKLQorICAgIGF1dG8mIHJvb3RJbmxpbmVCb3ggPSBs aW5lQm94LnJvb3RJbmxpbmVCb3goKTsKICAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsKICAg ICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxheW91dEJveCgpOwogICAgICAgICBhdXRvIGxv Z2ljYWxMZWZ0ID0gaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0ICsgcnVuLmxvZ2ljYWxMZWZ0KCk7 CkBAIC0yNzUsMzQgKzI4Miw2OCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxp bmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICAg ICAgLy8gbGV2ZWwgYm94IGNvbnRyaWJ1dGVzIDBweCB0byB0aGUgbGluZSBib3ggaGVpZ2h0LCBp dCBzaG91bGQgbm90IGJlIGNvbnNpZGVyZWQgZW1wdHkuCiAgICAgICAgICAgICBpZiAobWFyZ2lu Qm94SGVpZ2h0IHx8IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgfHwgaW5s aW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpKQogICAgICAgICAgICAgICAgIGF0b21p Y0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7CisgICAgICAgICAgICAvLyBMZXQncyBl c3RpbWF0ZSB0aGUgbG9naWNhbCB0b3Agc28gdGhhdCB3ZSBjYW4gYXZvaWQgcnVubmluZyB0aGUg YWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUgYm94ZXMuCisgICAgICAgICAgICBhdXRvIGFsaWdu SW5saW5lQm94SWZFbGlnaWJsZSA9IFsmXSB7CisgICAgICAgICAgICAgICAgaWYgKG1faW5saW5l TGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkKKyAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1zdHJldGNoeSBk aXJlY3QgY2hpbGRyZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBub3cuCisgICAg ICAgICAgICAgICAgYXV0byBpc0NvbnNpZGVyZWRTaW1wbGUgPSAmbGF5b3V0Qm94LnBhcmVudCgp ID09ICZyb290Qm94KCkKKyAgICAgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94LnN0eWxlKCku dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCisgICAgICAgICAgICAg ICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpCisgICAgICAg ICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCkKKyAg ICAgICAgICAgICAgICAgICAgJiYgbWFyZ2luQm94SGVpZ2h0IDw9IHJvb3RJbmxpbmVCb3guYmFz ZWxpbmUoKTsKKyAgICAgICAgICAgICAgICBpZiAoIWlzQ29uc2lkZXJlZFNpbXBsZSkgeworICAg ICAgICAgICAgICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQg PSB0cnVlOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMb2dpY2FsVG9wKHJvb3RJ bmxpbmVCb3guYmFzZWxpbmUoKSAtIGFzY2VudCk7CisgICAgICAgICAgICB9OworICAgICAgICAg ICAgYWxpZ25JbmxpbmVCb3hJZkVsaWdpYmxlKCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElu bGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKLSAgICAgICAgfSBl bHNlIGlmIChydW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7CisgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgfQorICAgICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIHNpbXBsZSBpbmxp bmUgYm94ZXMgdG9vLgorICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGln bm1lbnQgPSB0cnVlOworICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewogICAg ICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgo KSAtIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2Fs V2lkdGggPj0gMCk7CiAgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGlu ZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgaW5pdGlh bExvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5l Qm94KCppbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChX VEZNb3ZlKGlubGluZUJveCkpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0lubGluZUJveEVu ZCgpKSB7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBpZiAocnVu LmlzSW5saW5lQm94RW5kKCkpIHsKICAgICAgICAgICAgIC8vIEFkanVzdCB0aGUgbG9naWNhbCB3 aWR0aCB3aGVuIHRoZSBpbmxpbmUgbGV2ZWwgY29udGFpbmVyIGNsb3NlcyBvbiB0aGlzIGxpbmUu CiAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3ggPSBsaW5lQm94LmlubGluZUxldmVsQm94Rm9y TGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94LmlzSW5s aW5lQm94KCkpOwogICAgICAgICAgICAgaW5saW5lQm94LnNldExvZ2ljYWxXaWR0aChydW4ubG9n aWNhbFJpZ2h0KCkgLSBpbmxpbmVCb3gubG9naWNhbExlZnQoKSk7Ci0gICAgICAgIH0gZWxzZSBp ZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSkgeworICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4uaXNT b2Z0TGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBBZGp1c3Qgbm9uLWVtcHR5 IGlubGluZSBib3ggaGVpZ2h0IHdoZW4gZ2x5cGhzIGZyb20gdGhlIG5vbi1wcmltYXJ5IGZvbnQg c3RyZXRjaCB0aGUgYm94LgogICAgICAgICAgICAgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxh eW91dEJveChsYXlvdXRCb3gucGFyZW50KCkpLnNldElzTm9uRW1wdHkoKTsKLSAgICAgICAgfSBl bHNlIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICB9CisgICAgICAgIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKICAgICAgICAg ICAgIGF1dG8gbGluZUJyZWFrQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxp bmVCcmVha0JveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KTsKICAgICAgICAgICAgIHNldFZlcnRp Y2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goKmxpbmVCcmVha0JveCk7CiAgICAgICAgICAgICBsaW5l QnJlYWtCb3gtPnNldElzTm9uRW1wdHkoKTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5l TGV2ZWxCb3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKLSAgICAgICAgfSBlbHNlIGlmIChydW4u aXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAg IH0KKyAgICAgICAgaWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpIHsKICAgICAgICAg ICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNy ZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KSk7Ci0gICAg ICAgIGVsc2UKLSAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg fQorICAgIGlmICghbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KSB7Cisg ICAgICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNhbFRvcCh7IH0pOworICAgICAgICBsaW5lQm94 LnNldExvZ2ljYWxIZWlnaHQocm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSk7 CiAgICAgfQogfQogCi12b2lkIExpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFu ZGFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkoTGluZUJveCYgbGluZUJveCkKK3ZvaWQg TGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJv eGVzVmVydGljYWxseShMaW5lQm94JiBsaW5lQm94KQogewogICAgIC8vIFRoaXMgZnVuY3Rpb24g KHBhcnRpYWxseSkgaW1wbGVtZW50czoKICAgICAvLyAyLjIuIExheW91dCBXaXRoaW4gTGluZSBC b3hlcwo=