232546 2021-10-31 12:21:35 -0700 [LFC][IFC] Introduce paragraph content building to InlineItemsBuilder::handleTextContent 2021-11-01 08:41:19 -0700 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 1810513 0 zalan 2021-10-31 12:21:35 -0700 ssia 1810514 1 442937 zalan 2021-10-31 12:26:55 -0700 Created attachment 442937 Patch 1810523 2 442940 zalan 2021-10-31 14:53:39 -0700 Created attachment 442940 Patch 1810626 3 ews-feeder 2021-11-01 08:40:40 -0700 Committed r285104 (243746@main): <https://commits.webkit.org/243746@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442940. 1810627 4 webkit-bug-importer 2021-11-01 08:41:19 -0700 <rdar://problem/84882412> 442937 2021-10-31 12:26:55 -0700 2021-10-31 14:52:34 -0700 Patch bug-232546-20211031122654.patch text/plain 13627 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGViMDNjMmI2MzEyN2I1 MTQ0OGFjZWQ3ODcwNzRmNTc4ZDAwODZkZS4uN2MxMjg0ZjE2MWQxOGVmMGUzZDVjYTk4MDdiNjEy ZTAxYzQ4YmYyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEwLTMxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEludHJvZHVj ZSBwYXJhZ3JhcGggY29udGVudCBidWlsZGluZyB0byBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRs ZVRleHRDb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzI1NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBMZXQncyBjaGVjayBmb3IgZGlyZWN0aW9uYWwgY29udHJvbCBjaGFyYWN0ZXJzIGluIHRl eHQgY29udGVudCBhbmQgYnVpbGQKKyAgICAgICAgdGhlIHBhcmFncmFwaCBjb250ZW50IGFjY29y ZGluZ2x5LiBOb3cgdGhhdCB3ZSd2ZSBnb3QgYm90aCB0aGUgaW5saW5lIGJveCBhbmQKKyAgICAg ICAgdGhlIHRleHQgYmlkaSBjb250ZW50IChhdG9taWMgaW5saW5lIGxldmVsIGJveGVzIGFyZSBz dGlsbCBtaXNzaW5nKSBicmVha0lubGluZUl0ZW1zQXRCaWRpQm91bmRhcmllcworICAgICAgICBj YW4gc3RhcnQgY2FsbGluZyBpbnRvIHViaWRpIHRvIGZpbmQgY29udGVudCBib3VuZGFyaWVzLgor CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVy OjpoYW5kbGVUZXh0Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0 ZW1zQnVpbGRlcjo6ZW50ZXJCaWRpQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZUl0ZW1zQnVpbGRlcjo6YnVpbGRQcmV2aW91c1RleHRDb250ZW50KToKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuaDoK KyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Y2FuVXNlRm9yRm9udEFu ZFRleHQpOgorCiAyMDIxLTEwLTMwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIEtlZXAgdHJhY2sgb2YgdGhlIHRleHQgYm94IG9mZnNldCBpbiB1 YmlkaSdzIHBhcmFncmFwaCBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmNwcAppbmRleCA2YzM4NTNhYzgxYmU5NTZjNDViOTA4NGYxYjg1ZDYxZTViZDBhOWRi Li5lMTlmYzRkNmEzMWVjNzY3MGRjNDMyYjA2NTg5MjQ2ZmQ2NWUwYjlmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVt c0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKQEAgLTMzLDYgKzMzLDggQEAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCisjZGVmaW5lIEFMTE9XX0JJRElf Q09OVEVOVCAxCisKIHN0cnVjdCBXaGl0ZXNwYWNlQ29udGVudCB7CiAgICAgc2l6ZV90IGxlbmd0 aCB7IDAgfTsKICAgICBib29sIGlzV29yZFNlcGFyYXRvciB7IHRydWUgfTsKQEAgLTEzOSw3ICsx NDEsOCBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtJbmxpbmVJdGVtc0F0QmlkaUJv dW5kYXJpZXMoSW5saW5lSXRlbXMmKQogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRl eHRDb250ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIElubGluZUl0ZW1z JiBpbmxpbmVJdGVtcykKIHsKICAgICBhdXRvIHRleHQgPSBpbmxpbmVUZXh0Qm94LmNvbnRlbnQo KTsKLSAgICBpZiAoIXRleHQubGVuZ3RoKCkpCisgICAgYXV0byBjb250ZW50TGVuZ3RoID0gdGV4 dC5sZW5ndGgoKTsKKyAgICBpZiAoIWNvbnRlbnRMZW5ndGgpCiAgICAgICAgIHJldHVybiBpbmxp bmVJdGVtcy5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUVtcHR5SXRlbShpbmxpbmVUZXh0 Qm94KSk7CiAKICAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRCb3guc3R5bGUoKTsKQEAgLTE1 OCwyMCArMTYxLDI5IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVu dChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBJCiAgICAgICAgIHJldHVybiBU ZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24s IHN0YXJ0UG9zaXRpb24gKyBsZW5ndGgsIHsgfSk7CiAgICAgfTsKIAotICAgIHdoaWxlIChjdXJy ZW50UG9zaXRpb24gPCB0ZXh0Lmxlbmd0aCgpKSB7Ci0gICAgICAgIGF1dG8gaXNTZWdtZW50QnJl YWtDYW5kaWRhdGUgPSBbXShhdXRvIGNoYXJhY3RlcikgewotICAgICAgICAgICAgcmV0dXJuIGNo YXJhY3RlciA9PSAnXG4nOwotICAgICAgICB9OworICAgIGlmICghbV9wYXJhZ3JhcGhDb250ZW50 QnVpbGRlci5pc0VtcHR5KCkpIHsKKyAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFwLnNldCgmaW5s aW5lVGV4dEJveCwgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSk7CisgICAgICAg IG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuYXBwZW5kKHRleHQpOworICAgIH0KIAotICAgICAg ICAvLyBTZWdtZW50IGJyZWFrcyB3aXRoIHByZXNlcnZlIG5ldyBsaW5lIHN0eWxlICh3aGl0ZS1z cGFjZTogcHJlLCBwcmUtd3JhcCwgYnJlYWstc3BhY2VzIGFuZCBwcmUtbGluZSkgY29tcHV0ZSB0 byBmb3JjZWQgbGluZSBicmVhay4KLSAgICAgICAgaWYgKGlzU2VnbWVudEJyZWFrQ2FuZGlkYXRl KHRleHRbY3VycmVudFBvc2l0aW9uXSkgJiYgc2hvdWxkUHJlc2VydmVOZXdsaW5lKSB7Ci0gICAg ICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQoSW5saW5lU29mdExpbmVCcmVha0l0ZW06OmNyZWF0 ZVNvZnRMaW5lQnJlYWtJdGVtKGlubGluZVRleHRCb3gsIGN1cnJlbnRQb3NpdGlvbikpOwotICAg ICAgICAgICAgKytjdXJyZW50UG9zaXRpb247CisgICAgd2hpbGUgKGN1cnJlbnRQb3NpdGlvbiA8 IGNvbnRlbnRMZW5ndGgpIHsKKyAgICAgICAgYXV0byBoYW5kbGVTZWdtZW50QnJlYWsgPSBbJl0g eworICAgICAgICAgICAgLy8gU2VnbWVudCBicmVha3Mgd2l0aCBwcmVzZXJ2ZSBuZXcgbGluZSBz dHlsZSAod2hpdGUtc3BhY2U6IHByZSwgcHJlLXdyYXAsIGJyZWFrLXNwYWNlcyBhbmQgcHJlLWxp bmUpIGNvbXB1dGUgdG8gZm9yY2VkIGxpbmUgYnJlYWsuCisgICAgICAgICAgICBhdXRvIGlzU2Vn bWVudEJyZWFrQ2FuZGlkYXRlID0gdGV4dFtjdXJyZW50UG9zaXRpb25dID09IG5ld2xpbmVDaGFy YWN0ZXI7CisgICAgICAgICAgICBpZiAoIWlzU2VnbWVudEJyZWFrQ2FuZGlkYXRlIHx8ICFzaG91 bGRQcmVzZXJ2ZU5ld2xpbmUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKElubGluZVNvZnRMaW5lQnJlYWtJdGVtOjpjcmVhdGVT b2Z0TGluZUJyZWFrSXRlbShpbmxpbmVUZXh0Qm94LCBjdXJyZW50UG9zaXRpb24rKykpOworICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH07CisgICAgICAgIGlmIChoYW5kbGVTZWdt ZW50QnJlYWsoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CiAKLSAgICAgICAg YXV0byBzdG9wQXRXb3JkU2VwYXJhdG9yQm91bmRhcnkgPSBzaG91bGRQcmVzZXJ2ZVNwYWNlc0Fu ZFRhYnMgJiYgZm9udENhc2NhZGUud29yZFNwYWNpbmcoKTsKLSAgICAgICAgaWYgKGF1dG8gd2hp dGVzcGFjZUNvbnRlbnQgPSBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKHRleHQsIGN1 cnJlbnRQb3NpdGlvbiwgc2hvdWxkUHJlc2VydmVOZXdsaW5lLCBzaG91bGRQcmVzZXJ2ZVNwYWNl c0FuZFRhYnMsIHNob3VsZFRyZWF0Tm9uQnJlYWtpbmdTcGFjZUFzUmVndWxhclNwYWNlLCBzdG9w QXRXb3JkU2VwYXJhdG9yQm91bmRhcnkpKSB7CisgICAgICAgIGF1dG8gaGFuZGxlV2hpdGVzcGFj ZSA9IFsmXSB7CisgICAgICAgICAgICBhdXRvIHN0b3BBdFdvcmRTZXBhcmF0b3JCb3VuZGFyeSA9 IHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyAmJiBmb250Q2FzY2FkZS53b3JkU3BhY2luZygp OworICAgICAgICAgICAgYXV0byB3aGl0ZXNwYWNlQ29udGVudCA9IG1vdmVUb05leHROb25XaGl0 ZXNwYWNlUG9zaXRpb24odGV4dCwgY3VycmVudFBvc2l0aW9uLCBzaG91bGRQcmVzZXJ2ZU5ld2xp bmUsIHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicywgc2hvdWxkVHJlYXROb25CcmVha2luZ1Nw YWNlQXNSZWd1bGFyU3BhY2UsIHN0b3BBdFdvcmRTZXBhcmF0b3JCb3VuZGFyeSk7CisgICAgICAg ICAgICBpZiAoIXdoaXRlc3BhY2VDb250ZW50KQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKwogICAgICAgICAgICAgQVNTRVJUKHdoaXRlc3BhY2VDb250ZW50LT5sZW5ndGgpOwogICAg ICAgICAgICAgYXV0byBhcHBlbmRXaGl0ZXNwYWNlSXRlbSA9IFsmXSAoYXV0byBzdGFydFBvc2l0 aW9uLCBhdXRvIGl0ZW1MZW5ndGgpIHsKICAgICAgICAgICAgICAgICBhdXRvIHNpbXBsZVNpbmds ZVdoaXRlc3BhY2VDb250ZW50ID0gaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVu dE1lYXN1cmluZygpICYmIChpdGVtTGVuZ3RoID09IDEgfHwgd2hpdGVzcGFjZUNvbnRlbnRJc1Ry ZWF0ZWRBc1NpbmdsZVNwYWNlKTsKQEAgLTE4NywzMyArMTk5LDYwIEBAIHZvaWQgSW5saW5lSXRl bXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVU ZXh0Qm94LCBJCiAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBhcHBlbmRXaGl0 ZXNwYWNlSXRlbShjdXJyZW50UG9zaXRpb24sIHdoaXRlc3BhY2VDb250ZW50LT5sZW5ndGgpOwog ICAgICAgICAgICAgY3VycmVudFBvc2l0aW9uICs9IHdoaXRlc3BhY2VDb250ZW50LT5sZW5ndGg7 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfTsKKyAgICAgICAgaWYgKGhhbmRs ZVdoaXRlc3BhY2UoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CiAKLSAgICAg ICAgYXV0byBoYXNUcmFpbGluZ1NvZnRIeXBoZW4gPSBmYWxzZTsKLSAgICAgICAgYXV0byBpbml0 aWFsTm9uV2hpdGVzcGFjZVBvc2l0aW9uID0gY3VycmVudFBvc2l0aW9uOwotICAgICAgICBhdXRv IGlzQXRTb2Z0SHlwaGVuID0gWyZdKGF1dG8gcG9zaXRpb24pIHsKLSAgICAgICAgICAgIHJldHVy biB0ZXh0W3Bvc2l0aW9uXSA9PSBzb2Z0SHlwaGVuOwotICAgICAgICB9OwotICAgICAgICBpZiAo c3R5bGUuaHlwaGVucygpID09IEh5cGhlbnM6Ok5vbmUpIHsKLSAgICAgICAgICAgIC8vIExldCdz IG1lcmdlIGNhbmRpZGF0ZSBJbmxpbmVUZXh0SXRlbXMgc2VwYXJhdGVkIGJ5IHNvZnQgaHlwaGVu IHdoZW4gdGhlIHN0eWxlIHNheXMgc28uCi0gICAgICAgICAgICB3aGlsZSAoY3VycmVudFBvc2l0 aW9uIDwgdGV4dC5sZW5ndGgoKSkgewotICAgICAgICAgICAgICAgIGF1dG8gbm9uV2hpdGVTcGFj ZUxlbmd0aCA9IG1vdmVUb05leHRCcmVha2FibGVQb3NpdGlvbihjdXJyZW50UG9zaXRpb24sIGxp bmVCcmVha0l0ZXJhdG9yLCBzdHlsZSk7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKG5vbldoaXRl U3BhY2VMZW5ndGgpOwotICAgICAgICAgICAgICAgIGN1cnJlbnRQb3NpdGlvbiArPSBub25XaGl0 ZVNwYWNlTGVuZ3RoOwotICAgICAgICAgICAgICAgIGlmICghaXNBdFNvZnRIeXBoZW4oY3VycmVu dFBvc2l0aW9uIC0gMSkpCisgICAgICAgIGF1dG8gaGFuZGxlTm9uV2hpdGVzcGFjZSA9IFsmXSB7 CisgICAgICAgICAgICBhdXRvIHN0YXJ0UG9zaXRpb24gPSBjdXJyZW50UG9zaXRpb247CisgICAg ICAgICAgICBhdXRvIGVuZFBvc2l0aW9uID0gc3RhcnRQb3NpdGlvbjsKKyAgICAgICAgICAgIGF1 dG8gaGFzVHJhaWxpbmdTb2Z0SHlwaGVuID0gZmFsc2U7CisgICAgICAgICAgICBpZiAoc3R5bGUu aHlwaGVucygpID09IEh5cGhlbnM6Ok5vbmUpIHsKKyAgICAgICAgICAgICAgICAvLyBMZXQncyBt ZXJnZSBjYW5kaWRhdGUgSW5saW5lVGV4dEl0ZW1zIHNlcGFyYXRlZCBieSBzb2Z0IGh5cGhlbiB3 aGVuIHRoZSBzdHlsZSBzYXlzIHNvLgorICAgICAgICAgICAgICAgIGRvIHsKKyAgICAgICAgICAg ICAgICAgICAgZW5kUG9zaXRpb24gKz0gbW92ZVRvTmV4dEJyZWFrYWJsZVBvc2l0aW9uKGVuZFBv c2l0aW9uLCBsaW5lQnJlYWtJdGVyYXRvciwgc3R5bGUpOworICAgICAgICAgICAgICAgICAgICBB U1NFUlQoc3RhcnRQb3NpdGlvbiA8IGVuZFBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICB9IHdo aWxlIChlbmRQb3NpdGlvbiA8IGNvbnRlbnRMZW5ndGggJiYgdGV4dFtlbmRQb3NpdGlvbiAtIDFd ID09IHNvZnRIeXBoZW4pOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBl bmRQb3NpdGlvbiArPSBtb3ZlVG9OZXh0QnJlYWthYmxlUG9zaXRpb24oc3RhcnRQb3NpdGlvbiwg bGluZUJyZWFrSXRlcmF0b3IsIHN0eWxlKTsKKyAgICAgICAgICAgICAgICBBU1NFUlQoc3RhcnRQ b3NpdGlvbiA8IGVuZFBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICBoYXNUcmFpbGluZ1NvZnRI eXBoZW4gPSB0ZXh0W2VuZFBvc2l0aW9uIC0gMV0gPT0gc29mdEh5cGhlbjsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIEFTU0VSVF9JTVBMSUVTKHN0eWxlLmh5cGhlbnMoKSA9PSBIeXBoZW5z OjpOb25lLCAhaGFzVHJhaWxpbmdTb2Z0SHlwaGVuKTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5l SXRlbUxlbmd0aCA9IGVuZFBvc2l0aW9uIC0gc3RhcnRQb3NpdGlvbjsKKyAgICAgICAgICAgIGlu bGluZUl0ZW1zLmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0o aW5saW5lVGV4dEJveCwgc3RhcnRQb3NpdGlvbiwgaW5saW5lSXRlbUxlbmd0aCwgVUJJRElfREVG QVVMVF9MVFIsIGhhc1RyYWlsaW5nU29mdEh5cGhlbiwgaW5saW5lSXRlbVdpZHRoKHN0YXJ0UG9z aXRpb24sIGlubGluZUl0ZW1MZW5ndGgpKSk7CisgICAgICAgICAgICBjdXJyZW50UG9zaXRpb24g PSBlbmRQb3NpdGlvbjsKKyNpZiBBTExPV19CSURJX0NPTlRFTlQKKyAgICAgICAgICAgIC8vIENo ZWNrIGlmIHRoZSBjb250ZW50IGhhcyBiaWRpIGRlcGVuZGVuY3kgc28gdGhhdCB3ZSBoYXZlIHRv IHN0YXJ0IGJ1aWxkaW5nIHRoZSBwYXJhZ3JhcGggY29udGVudCBmb3IgdWJpZGkuCisgICAgICAg ICAgICBpZiAodGV4dC5pczhCaXQoKSB8fCAhbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0Vt cHR5KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgICAgIGZvciAo YXV0byBwb3NpdGlvbiA9IHN0YXJ0UG9zaXRpb247IHBvc2l0aW9uIDwgZW5kUG9zaXRpb247KSB7 CisgICAgICAgICAgICAgICAgVUNoYXIzMiBjaGFyYWN0ZXI7CisgICAgICAgICAgICAgICAgVTE2 X05FWFQodGV4dC5jaGFyYWN0ZXJzMTYoKSwgcG9zaXRpb24sIGNvbnRlbnRMZW5ndGgsIGNoYXJh Y3Rlcik7CisKKyAgICAgICAgICAgICAgICBhdXRvIGJpZGlDYXRlZ29yeSA9IHVfY2hhckRpcmVj dGlvbihjaGFyYWN0ZXIpOworICAgICAgICAgICAgICAgIGF1dG8gbmVlZHNCaWRpID0gYmlkaUNh dGVnb3J5ID09IFVfUklHSFRfVE9fTEVGVAorICAgICAgICAgICAgICAgICAgICB8fCBiaWRpQ2F0 ZWdvcnkgPT0gVV9SSUdIVF9UT19MRUZUX0FSQUJJQworICAgICAgICAgICAgICAgICAgICB8fCBi aWRpQ2F0ZWdvcnkgPT0gVV9SSUdIVF9UT19MRUZUX0VNQkVERElORworICAgICAgICAgICAgICAg ICAgICB8fCBiaWRpQ2F0ZWdvcnkgPT0gVV9SSUdIVF9UT19MRUZUX09WRVJSSURFCisgICAgICAg ICAgICAgICAgICAgIHx8IGJpZGlDYXRlZ29yeSA9PSBVX0xFRlRfVE9fUklHSFRfRU1CRURESU5H CisgICAgICAgICAgICAgICAgICAgIHx8IGJpZGlDYXRlZ29yeSA9PSBVX0xFRlRfVE9fUklHSFRf T1ZFUlJJREUKKyAgICAgICAgICAgICAgICAgICAgfHwgYmlkaUNhdGVnb3J5ID09IFVfUE9QX0RJ UkVDVElPTkFMX0ZPUk1BVDsKKyAgICAgICAgICAgICAgICBpZiAobmVlZHNCaWRpKSB7CisgICAg ICAgICAgICAgICAgICAgIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudChpbmxpbmVJdGVtcyk7Cisg ICAgICAgICAgICAgICAgICAgIC8vIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCB0YWtlcyBjYXJl IG9mIHRoaXMgY29udGVudCB0b28gYXMgc29tZSBpbmxpbmUgaXRlbXMgaGF2ZSBhbHJlYWR5IGJl ZW4gY29uc3RydWN0ZWQgZm9yIHRoaXMgdGV4dC4KICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgYXV0byBub25XaGl0ZVNwYWNlTGVuZ3RoID0gbW92ZVRvTmV4dEJyZWFrYWJsZVBv c2l0aW9uKGluaXRpYWxOb25XaGl0ZXNwYWNlUG9zaXRpb24sIGxpbmVCcmVha0l0ZXJhdG9yLCBz dHlsZSk7Ci0gICAgICAgICAgICBBU1NFUlQobm9uV2hpdGVTcGFjZUxlbmd0aCk7Ci0gICAgICAg ICAgICBjdXJyZW50UG9zaXRpb24gKz0gbm9uV2hpdGVTcGFjZUxlbmd0aDsKLSAgICAgICAgICAg IGhhc1RyYWlsaW5nU29mdEh5cGhlbiA9IGlzQXRTb2Z0SHlwaGVuKGN1cnJlbnRQb3NpdGlvbiAt IDEpOwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChpbml0aWFsTm9uV2hpdGVzcGFjZVBvc2l0 aW9uIDwgY3VycmVudFBvc2l0aW9uKTsKLSAgICAgICAgQVNTRVJUX0lNUExJRVMoc3R5bGUuaHlw aGVucygpID09IEh5cGhlbnM6Ok5vbmUsICFoYXNUcmFpbGluZ1NvZnRIeXBoZW4pOwotICAgICAg ICBhdXRvIGxlbmd0aCA9IGN1cnJlbnRQb3NpdGlvbiAtIGluaXRpYWxOb25XaGl0ZXNwYWNlUG9z aXRpb247Ci0gICAgICAgIGlubGluZUl0ZW1zLmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRl Tm9uV2hpdGVzcGFjZUl0ZW0oaW5saW5lVGV4dEJveCwgaW5pdGlhbE5vbldoaXRlc3BhY2VQb3Np dGlvbiwgbGVuZ3RoLCBVQklESV9ERUZBVUxUX0xUUiwgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBp bmxpbmVJdGVtV2lkdGgoaW5pdGlhbE5vbldoaXRlc3BhY2VQb3NpdGlvbiwgbGVuZ3RoKSkpOwor I2VuZGlmCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfTsKKyAgICAgICAgaWYg KGhhbmRsZU5vbldoaXRlc3BhY2UoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAv LyBVbnN1cHBvcnRlZCBjb250ZW50PworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICB9CiB9CiAKQEAgLTMxNSwyNSArMzU0LDggQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6Omhh bmRsZUlubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYKIAog dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gs IFVDaGFyIGNvbnRyb2xDaGFyYWN0ZXIsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykK IHsKLSAgICBpZiAobV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkpIHsKLSAgICAg ICAgLy8gRklYTUU6IE1vdmUgdGhpcyB0byBhIGRlZGljYXRlZCBmdW5jdGlvbiB0byBzdXBwb3J0 IGNvbnRyb2wgY2hhcmFjdGVycyBlbWJlZGRlZCBpbiB0ZXh0IGNvbnRlbnQuCi0gICAgICAgIGF1 dG8gYnVpbGRQcmV2aW91c1RleHRDb250ZW50ID0gWyZdIHsKLSAgICAgICAgICAgIGNvbnN0IEJv eCogbGFzdExheW91dEJveCA9IG51bGxwdHI7Ci0gICAgICAgICAgICBmb3IgKGF1dG8mIGlubGlu ZUl0ZW0gOiBpbmxpbmVJdGVtcykgewotICAgICAgICAgICAgICAgIGlmICghaW5saW5lSXRlbS5p c1RleHQoKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAg YXV0byYgbGF5b3V0Qm94ID0gaW5saW5lSXRlbS5sYXlvdXRCb3goKTsKLSAgICAgICAgICAgICAg ICBpZiAobGFzdExheW91dEJveCA9PSAmbGF5b3V0Qm94KSB7Ci0gICAgICAgICAgICAgICAgICAg IC8vIFdlJ3ZlIGFscmVhZHkgYXBwZW5kZWQgdGhpcyBjb250ZW50LgotICAgICAgICAgICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgbV9jb250 ZW50T2Zmc2V0TWFwLnNldCgmbGF5b3V0Qm94LCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmxl bmd0aCgpKTsKLSAgICAgICAgICAgICAgICBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmFwcGVu ZChkb3duY2FzdDxJbmxpbmVUZXh0Qm94PihsYXlvdXRCb3gpLmNvbnRlbnQoKSk7Ci0gICAgICAg ICAgICAgICAgbGFzdExheW91dEJveCA9ICZsYXlvdXRCb3g7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH07Ci0gICAgICAgIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCgpOwotICAgIH0KKyAgICBp ZiAobV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkpCisgICAgICAgIGJ1aWxkUHJl dmlvdXNUZXh0Q29udGVudChpbmxpbmVJdGVtcyk7CiAgICAgLy8gTGV0IHRoZSBmaXJzdCBjb250 cm9sIGNoYXJhY3RlciByZXByZXNlbnQgdGhlICBib3guCiAgICAgbV9jb250ZW50T2Zmc2V0TWFw LmFkZCgmYm94LCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpKTsKICAgICBtX3Bh cmFncmFwaENvbnRlbnRCdWlsZGVyLmFwcGVuZChjb250cm9sQ2hhcmFjdGVyKTsKQEAgLTM0NSw2 ICszNjcsMjYgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmV4aXRCaWRpQ29udGV4dChjb25z dCBCb3gmLCBVQ2hhciBjb250cm9sQ2hhcmFjdGVyKQogICAgIG1fcGFyYWdyYXBoQ29udGVudEJ1 aWxkZXIuYXBwZW5kKGNvbnRyb2xDaGFyYWN0ZXIpOwogfQogCit2b2lkIElubGluZUl0ZW1zQnVp bGRlcjo6YnVpbGRQcmV2aW91c1RleHRDb250ZW50KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJ dGVtcykKK3sKKyAgICBBU1NFUlQobV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkp OworICAgIEFTU0VSVChtX2NvbnRlbnRPZmZzZXRNYXAuaXNFbXB0eSgpKTsKKworICAgIGNvbnN0 IEJveCogbGFzdExheW91dEJveCA9IG51bGxwdHI7CisgICAgZm9yIChhdXRvJiBpbmxpbmVJdGVt IDogaW5saW5lSXRlbXMpIHsKKyAgICAgICAgaWYgKCFpbmxpbmVJdGVtLmlzVGV4dCgpKQorICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0u bGF5b3V0Qm94KCk7CisgICAgICAgIGlmIChsYXN0TGF5b3V0Qm94ID09ICZsYXlvdXRCb3gpIHsK KyAgICAgICAgICAgIC8vIFdlJ3ZlIGFscmVhZHkgYXBwZW5kZWQgdGhpcyBjb250ZW50LgorICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFw LnNldCgmbGF5b3V0Qm94LCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpKTsKKyAg ICAgICAgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5hcHBlbmQoZG93bmNhc3Q8SW5saW5lVGV4 dEJveD4obGF5b3V0Qm94KS5jb250ZW50KCkpOworICAgICAgICBsYXN0TGF5b3V0Qm94ID0gJmxh eW91dEJveDsKKyAgICB9Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVt c0J1aWxkZXIuaAppbmRleCA5YWJkNGI4OWJhYjJlMjNiOTY2MDQ3ZDQ4YTc4ZmFhOWQ2OGRlMDQ3 Li5hMjIwZGJmOWVmYjg1OGRmMmY4MDJkN2Q5YjU2NDUyODRmNjZiN2FiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVt c0J1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuaApAQCAtNTIsNiArNTIsOCBAQCBwcml2YXRlOgog ICAgIHZvaWQgZW50ZXJCaWRpQ29udGV4dChjb25zdCBCb3gmLCBVQ2hhciwgY29uc3QgSW5saW5l SXRlbXMmKTsKICAgICB2b2lkIGV4aXRCaWRpQ29udGV4dChjb25zdCBCb3gmLCBVQ2hhcik7CiAK KyAgICB2b2lkIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudChjb25zdCBJbmxpbmVJdGVtcyYpOwor CiAgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9yb290OyB9 CiAKICAgICBjb25zdCBDb250YWluZXJCb3gmIG1fcm9vdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVy YWdlLmNwcAppbmRleCA0NjkzNDQ1NGY2ZDc4NWEwODdhZmFlZGE5MTZlOGNiZmQ4ODQ2NDdmLi45 YTMyYjMxNmEzNmIxNzJhOTBhNzRkZGI2YjNlZGFhODlhYjMyYjQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uQ292ZXJhZ2UuY3BwCkBAIC0zOTEsNiArMzkxLDkgQEAgc3RhdGljIE9wdGlvblNldDxBdm9p ZGFuY2VSZWFzb24+IGNhblVzZUZvclRleHQoU3RyaW5nVmlldyB0ZXh0LCBJbmNsdWRlUmVhc29u cwogc3RhdGljIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckZvbnRBbmRUZXh0 KGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXIsIEluY2x1ZGVSZWFzb25zIGlu Y2x1ZGVSZWFzb25zKQogewogICAgIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IHJlYXNvbnM7 CisgICAgYXV0byBmZmYgPSB0cnVlOworICAgIGlmIChmZmYpCisgICAgICAgIHJldHVybiByZWFz b25zOwogICAgIC8vIFdlIGFzc3VtZSB0aGF0IGFsbCBsaW5lcyBoYXZlIG1ldHJpY3MgYmFzZWQg cHVyZWx5IG9uIHRoZSBwcmltYXJ5IGZvbnQuCiAgICAgY29uc3QgYXV0byYgc3R5bGUgPSBjb250 YWluZXIuc3R5bGUoKTsKICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRl KCk7Cg== 442940 2021-10-31 14:53:39 -0700 2021-11-01 08:40:41 -0700 Patch bug-232546-20211031145339.patch text/plain 12747 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGViMDNjMmI2MzEyN2I1 MTQ0OGFjZWQ3ODcwNzRmNTc4ZDAwODZkZS4uN2MxMjg0ZjE2MWQxOGVmMGUzZDVjYTk4MDdiNjEy ZTAxYzQ4YmYyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEwLTMxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEludHJvZHVj ZSBwYXJhZ3JhcGggY29udGVudCBidWlsZGluZyB0byBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRs ZVRleHRDb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzI1NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBMZXQncyBjaGVjayBmb3IgZGlyZWN0aW9uYWwgY29udHJvbCBjaGFyYWN0ZXJzIGluIHRl eHQgY29udGVudCBhbmQgYnVpbGQKKyAgICAgICAgdGhlIHBhcmFncmFwaCBjb250ZW50IGFjY29y ZGluZ2x5LiBOb3cgdGhhdCB3ZSd2ZSBnb3QgYm90aCB0aGUgaW5saW5lIGJveCBhbmQKKyAgICAg ICAgdGhlIHRleHQgYmlkaSBjb250ZW50IChhdG9taWMgaW5saW5lIGxldmVsIGJveGVzIGFyZSBz dGlsbCBtaXNzaW5nKSBicmVha0lubGluZUl0ZW1zQXRCaWRpQm91bmRhcmllcworICAgICAgICBj YW4gc3RhcnQgY2FsbGluZyBpbnRvIHViaWRpIHRvIGZpbmQgY29udGVudCBib3VuZGFyaWVzLgor CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVy OjpoYW5kbGVUZXh0Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0 ZW1zQnVpbGRlcjo6ZW50ZXJCaWRpQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZUl0ZW1zQnVpbGRlcjo6YnVpbGRQcmV2aW91c1RleHRDb250ZW50KToKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuaDoK KyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Y2FuVXNlRm9yRm9udEFu ZFRleHQpOgorCiAyMDIxLTEwLTMwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIEtlZXAgdHJhY2sgb2YgdGhlIHRleHQgYm94IG9mZnNldCBpbiB1 YmlkaSdzIHBhcmFncmFwaCBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmNwcAppbmRleCA2YzM4NTNhYzgxYmU5NTZjNDViOTA4NGYxYjg1ZDYxZTViZDBhOWRi Li4xNDI2ZDY0OWE3MjEyOGUwY2QzNmUzMWRkYTliMmM2YWRkYmU3OTE2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVt c0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKQEAgLTMzLDYgKzMzLDggQEAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCisjZGVmaW5lIEFMTE9XX0JJRElf Q09OVEVOVCAwCisKIHN0cnVjdCBXaGl0ZXNwYWNlQ29udGVudCB7CiAgICAgc2l6ZV90IGxlbmd0 aCB7IDAgfTsKICAgICBib29sIGlzV29yZFNlcGFyYXRvciB7IHRydWUgfTsKQEAgLTEzOSw3ICsx NDEsOCBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtJbmxpbmVJdGVtc0F0QmlkaUJv dW5kYXJpZXMoSW5saW5lSXRlbXMmKQogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRl eHRDb250ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIElubGluZUl0ZW1z JiBpbmxpbmVJdGVtcykKIHsKICAgICBhdXRvIHRleHQgPSBpbmxpbmVUZXh0Qm94LmNvbnRlbnQo KTsKLSAgICBpZiAoIXRleHQubGVuZ3RoKCkpCisgICAgYXV0byBjb250ZW50TGVuZ3RoID0gdGV4 dC5sZW5ndGgoKTsKKyAgICBpZiAoIWNvbnRlbnRMZW5ndGgpCiAgICAgICAgIHJldHVybiBpbmxp bmVJdGVtcy5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUVtcHR5SXRlbShpbmxpbmVUZXh0 Qm94KSk7CiAKICAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRCb3guc3R5bGUoKTsKQEAgLTE1 OCwyMCArMTYxLDI5IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVu dChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBJCiAgICAgICAgIHJldHVybiBU ZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24s IHN0YXJ0UG9zaXRpb24gKyBsZW5ndGgsIHsgfSk7CiAgICAgfTsKIAotICAgIHdoaWxlIChjdXJy ZW50UG9zaXRpb24gPCB0ZXh0Lmxlbmd0aCgpKSB7Ci0gICAgICAgIGF1dG8gaXNTZWdtZW50QnJl YWtDYW5kaWRhdGUgPSBbXShhdXRvIGNoYXJhY3RlcikgewotICAgICAgICAgICAgcmV0dXJuIGNo YXJhY3RlciA9PSAnXG4nOwotICAgICAgICB9OworICAgIGlmICghbV9wYXJhZ3JhcGhDb250ZW50 QnVpbGRlci5pc0VtcHR5KCkpIHsKKyAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFwLnNldCgmaW5s aW5lVGV4dEJveCwgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSk7CisgICAgICAg IG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuYXBwZW5kKHRleHQpOworICAgIH0KIAotICAgICAg ICAvLyBTZWdtZW50IGJyZWFrcyB3aXRoIHByZXNlcnZlIG5ldyBsaW5lIHN0eWxlICh3aGl0ZS1z cGFjZTogcHJlLCBwcmUtd3JhcCwgYnJlYWstc3BhY2VzIGFuZCBwcmUtbGluZSkgY29tcHV0ZSB0 byBmb3JjZWQgbGluZSBicmVhay4KLSAgICAgICAgaWYgKGlzU2VnbWVudEJyZWFrQ2FuZGlkYXRl KHRleHRbY3VycmVudFBvc2l0aW9uXSkgJiYgc2hvdWxkUHJlc2VydmVOZXdsaW5lKSB7Ci0gICAg ICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQoSW5saW5lU29mdExpbmVCcmVha0l0ZW06OmNyZWF0 ZVNvZnRMaW5lQnJlYWtJdGVtKGlubGluZVRleHRCb3gsIGN1cnJlbnRQb3NpdGlvbikpOwotICAg ICAgICAgICAgKytjdXJyZW50UG9zaXRpb247CisgICAgd2hpbGUgKGN1cnJlbnRQb3NpdGlvbiA8 IGNvbnRlbnRMZW5ndGgpIHsKKyAgICAgICAgYXV0byBoYW5kbGVTZWdtZW50QnJlYWsgPSBbJl0g eworICAgICAgICAgICAgLy8gU2VnbWVudCBicmVha3Mgd2l0aCBwcmVzZXJ2ZSBuZXcgbGluZSBz dHlsZSAod2hpdGUtc3BhY2U6IHByZSwgcHJlLXdyYXAsIGJyZWFrLXNwYWNlcyBhbmQgcHJlLWxp bmUpIGNvbXB1dGUgdG8gZm9yY2VkIGxpbmUgYnJlYWsuCisgICAgICAgICAgICBhdXRvIGlzU2Vn bWVudEJyZWFrQ2FuZGlkYXRlID0gdGV4dFtjdXJyZW50UG9zaXRpb25dID09IG5ld2xpbmVDaGFy YWN0ZXI7CisgICAgICAgICAgICBpZiAoIWlzU2VnbWVudEJyZWFrQ2FuZGlkYXRlIHx8ICFzaG91 bGRQcmVzZXJ2ZU5ld2xpbmUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKElubGluZVNvZnRMaW5lQnJlYWtJdGVtOjpjcmVhdGVT b2Z0TGluZUJyZWFrSXRlbShpbmxpbmVUZXh0Qm94LCBjdXJyZW50UG9zaXRpb24rKykpOworICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH07CisgICAgICAgIGlmIChoYW5kbGVTZWdt ZW50QnJlYWsoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CiAKLSAgICAgICAg YXV0byBzdG9wQXRXb3JkU2VwYXJhdG9yQm91bmRhcnkgPSBzaG91bGRQcmVzZXJ2ZVNwYWNlc0Fu ZFRhYnMgJiYgZm9udENhc2NhZGUud29yZFNwYWNpbmcoKTsKLSAgICAgICAgaWYgKGF1dG8gd2hp dGVzcGFjZUNvbnRlbnQgPSBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKHRleHQsIGN1 cnJlbnRQb3NpdGlvbiwgc2hvdWxkUHJlc2VydmVOZXdsaW5lLCBzaG91bGRQcmVzZXJ2ZVNwYWNl c0FuZFRhYnMsIHNob3VsZFRyZWF0Tm9uQnJlYWtpbmdTcGFjZUFzUmVndWxhclNwYWNlLCBzdG9w QXRXb3JkU2VwYXJhdG9yQm91bmRhcnkpKSB7CisgICAgICAgIGF1dG8gaGFuZGxlV2hpdGVzcGFj ZSA9IFsmXSB7CisgICAgICAgICAgICBhdXRvIHN0b3BBdFdvcmRTZXBhcmF0b3JCb3VuZGFyeSA9 IHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyAmJiBmb250Q2FzY2FkZS53b3JkU3BhY2luZygp OworICAgICAgICAgICAgYXV0byB3aGl0ZXNwYWNlQ29udGVudCA9IG1vdmVUb05leHROb25XaGl0 ZXNwYWNlUG9zaXRpb24odGV4dCwgY3VycmVudFBvc2l0aW9uLCBzaG91bGRQcmVzZXJ2ZU5ld2xp bmUsIHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicywgc2hvdWxkVHJlYXROb25CcmVha2luZ1Nw YWNlQXNSZWd1bGFyU3BhY2UsIHN0b3BBdFdvcmRTZXBhcmF0b3JCb3VuZGFyeSk7CisgICAgICAg ICAgICBpZiAoIXdoaXRlc3BhY2VDb250ZW50KQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKwogICAgICAgICAgICAgQVNTRVJUKHdoaXRlc3BhY2VDb250ZW50LT5sZW5ndGgpOwogICAg ICAgICAgICAgYXV0byBhcHBlbmRXaGl0ZXNwYWNlSXRlbSA9IFsmXSAoYXV0byBzdGFydFBvc2l0 aW9uLCBhdXRvIGl0ZW1MZW5ndGgpIHsKICAgICAgICAgICAgICAgICBhdXRvIHNpbXBsZVNpbmds ZVdoaXRlc3BhY2VDb250ZW50ID0gaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVu dE1lYXN1cmluZygpICYmIChpdGVtTGVuZ3RoID09IDEgfHwgd2hpdGVzcGFjZUNvbnRlbnRJc1Ry ZWF0ZWRBc1NpbmdsZVNwYWNlKTsKQEAgLTE4NywzMyArMTk5LDYwIEBAIHZvaWQgSW5saW5lSXRl bXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVU ZXh0Qm94LCBJCiAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBhcHBlbmRXaGl0 ZXNwYWNlSXRlbShjdXJyZW50UG9zaXRpb24sIHdoaXRlc3BhY2VDb250ZW50LT5sZW5ndGgpOwog ICAgICAgICAgICAgY3VycmVudFBvc2l0aW9uICs9IHdoaXRlc3BhY2VDb250ZW50LT5sZW5ndGg7 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfTsKKyAgICAgICAgaWYgKGhhbmRs ZVdoaXRlc3BhY2UoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CiAKLSAgICAg ICAgYXV0byBoYXNUcmFpbGluZ1NvZnRIeXBoZW4gPSBmYWxzZTsKLSAgICAgICAgYXV0byBpbml0 aWFsTm9uV2hpdGVzcGFjZVBvc2l0aW9uID0gY3VycmVudFBvc2l0aW9uOwotICAgICAgICBhdXRv IGlzQXRTb2Z0SHlwaGVuID0gWyZdKGF1dG8gcG9zaXRpb24pIHsKLSAgICAgICAgICAgIHJldHVy biB0ZXh0W3Bvc2l0aW9uXSA9PSBzb2Z0SHlwaGVuOwotICAgICAgICB9OwotICAgICAgICBpZiAo c3R5bGUuaHlwaGVucygpID09IEh5cGhlbnM6Ok5vbmUpIHsKLSAgICAgICAgICAgIC8vIExldCdz IG1lcmdlIGNhbmRpZGF0ZSBJbmxpbmVUZXh0SXRlbXMgc2VwYXJhdGVkIGJ5IHNvZnQgaHlwaGVu IHdoZW4gdGhlIHN0eWxlIHNheXMgc28uCi0gICAgICAgICAgICB3aGlsZSAoY3VycmVudFBvc2l0 aW9uIDwgdGV4dC5sZW5ndGgoKSkgewotICAgICAgICAgICAgICAgIGF1dG8gbm9uV2hpdGVTcGFj ZUxlbmd0aCA9IG1vdmVUb05leHRCcmVha2FibGVQb3NpdGlvbihjdXJyZW50UG9zaXRpb24sIGxp bmVCcmVha0l0ZXJhdG9yLCBzdHlsZSk7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKG5vbldoaXRl U3BhY2VMZW5ndGgpOwotICAgICAgICAgICAgICAgIGN1cnJlbnRQb3NpdGlvbiArPSBub25XaGl0 ZVNwYWNlTGVuZ3RoOwotICAgICAgICAgICAgICAgIGlmICghaXNBdFNvZnRIeXBoZW4oY3VycmVu dFBvc2l0aW9uIC0gMSkpCisgICAgICAgIGF1dG8gaGFuZGxlTm9uV2hpdGVzcGFjZSA9IFsmXSB7 CisgICAgICAgICAgICBhdXRvIHN0YXJ0UG9zaXRpb24gPSBjdXJyZW50UG9zaXRpb247CisgICAg ICAgICAgICBhdXRvIGVuZFBvc2l0aW9uID0gc3RhcnRQb3NpdGlvbjsKKyAgICAgICAgICAgIGF1 dG8gaGFzVHJhaWxpbmdTb2Z0SHlwaGVuID0gZmFsc2U7CisgICAgICAgICAgICBpZiAoc3R5bGUu aHlwaGVucygpID09IEh5cGhlbnM6Ok5vbmUpIHsKKyAgICAgICAgICAgICAgICAvLyBMZXQncyBt ZXJnZSBjYW5kaWRhdGUgSW5saW5lVGV4dEl0ZW1zIHNlcGFyYXRlZCBieSBzb2Z0IGh5cGhlbiB3 aGVuIHRoZSBzdHlsZSBzYXlzIHNvLgorICAgICAgICAgICAgICAgIGRvIHsKKyAgICAgICAgICAg ICAgICAgICAgZW5kUG9zaXRpb24gKz0gbW92ZVRvTmV4dEJyZWFrYWJsZVBvc2l0aW9uKGVuZFBv c2l0aW9uLCBsaW5lQnJlYWtJdGVyYXRvciwgc3R5bGUpOworICAgICAgICAgICAgICAgICAgICBB U1NFUlQoc3RhcnRQb3NpdGlvbiA8IGVuZFBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICB9IHdo aWxlIChlbmRQb3NpdGlvbiA8IGNvbnRlbnRMZW5ndGggJiYgdGV4dFtlbmRQb3NpdGlvbiAtIDFd ID09IHNvZnRIeXBoZW4pOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBl bmRQb3NpdGlvbiArPSBtb3ZlVG9OZXh0QnJlYWthYmxlUG9zaXRpb24oc3RhcnRQb3NpdGlvbiwg bGluZUJyZWFrSXRlcmF0b3IsIHN0eWxlKTsKKyAgICAgICAgICAgICAgICBBU1NFUlQoc3RhcnRQ b3NpdGlvbiA8IGVuZFBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICBoYXNUcmFpbGluZ1NvZnRI eXBoZW4gPSB0ZXh0W2VuZFBvc2l0aW9uIC0gMV0gPT0gc29mdEh5cGhlbjsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIEFTU0VSVF9JTVBMSUVTKHN0eWxlLmh5cGhlbnMoKSA9PSBIeXBoZW5z OjpOb25lLCAhaGFzVHJhaWxpbmdTb2Z0SHlwaGVuKTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5l SXRlbUxlbmd0aCA9IGVuZFBvc2l0aW9uIC0gc3RhcnRQb3NpdGlvbjsKKyAgICAgICAgICAgIGlu bGluZUl0ZW1zLmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0o aW5saW5lVGV4dEJveCwgc3RhcnRQb3NpdGlvbiwgaW5saW5lSXRlbUxlbmd0aCwgVUJJRElfREVG QVVMVF9MVFIsIGhhc1RyYWlsaW5nU29mdEh5cGhlbiwgaW5saW5lSXRlbVdpZHRoKHN0YXJ0UG9z aXRpb24sIGlubGluZUl0ZW1MZW5ndGgpKSk7CisgICAgICAgICAgICBjdXJyZW50UG9zaXRpb24g PSBlbmRQb3NpdGlvbjsKKyNpZiBBTExPV19CSURJX0NPTlRFTlQKKyAgICAgICAgICAgIC8vIENo ZWNrIGlmIHRoZSBjb250ZW50IGhhcyBiaWRpIGRlcGVuZGVuY3kgc28gdGhhdCB3ZSBoYXZlIHRv IHN0YXJ0IGJ1aWxkaW5nIHRoZSBwYXJhZ3JhcGggY29udGVudCBmb3IgdWJpZGkuCisgICAgICAg ICAgICBpZiAodGV4dC5pczhCaXQoKSB8fCAhbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0Vt cHR5KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgICAgIGZvciAo YXV0byBwb3NpdGlvbiA9IHN0YXJ0UG9zaXRpb247IHBvc2l0aW9uIDwgZW5kUG9zaXRpb247KSB7 CisgICAgICAgICAgICAgICAgVUNoYXIzMiBjaGFyYWN0ZXI7CisgICAgICAgICAgICAgICAgVTE2 X05FWFQodGV4dC5jaGFyYWN0ZXJzMTYoKSwgcG9zaXRpb24sIGNvbnRlbnRMZW5ndGgsIGNoYXJh Y3Rlcik7CisKKyAgICAgICAgICAgICAgICBhdXRvIGJpZGlDYXRlZ29yeSA9IHVfY2hhckRpcmVj dGlvbihjaGFyYWN0ZXIpOworICAgICAgICAgICAgICAgIGF1dG8gbmVlZHNCaWRpID0gYmlkaUNh dGVnb3J5ID09IFVfUklHSFRfVE9fTEVGVAorICAgICAgICAgICAgICAgICAgICB8fCBiaWRpQ2F0 ZWdvcnkgPT0gVV9SSUdIVF9UT19MRUZUX0FSQUJJQworICAgICAgICAgICAgICAgICAgICB8fCBi aWRpQ2F0ZWdvcnkgPT0gVV9SSUdIVF9UT19MRUZUX0VNQkVERElORworICAgICAgICAgICAgICAg ICAgICB8fCBiaWRpQ2F0ZWdvcnkgPT0gVV9SSUdIVF9UT19MRUZUX09WRVJSSURFCisgICAgICAg ICAgICAgICAgICAgIHx8IGJpZGlDYXRlZ29yeSA9PSBVX0xFRlRfVE9fUklHSFRfRU1CRURESU5H CisgICAgICAgICAgICAgICAgICAgIHx8IGJpZGlDYXRlZ29yeSA9PSBVX0xFRlRfVE9fUklHSFRf T1ZFUlJJREUKKyAgICAgICAgICAgICAgICAgICAgfHwgYmlkaUNhdGVnb3J5ID09IFVfUE9QX0RJ UkVDVElPTkFMX0ZPUk1BVDsKKyAgICAgICAgICAgICAgICBpZiAobmVlZHNCaWRpKSB7CisgICAg ICAgICAgICAgICAgICAgIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudChpbmxpbmVJdGVtcyk7Cisg ICAgICAgICAgICAgICAgICAgIC8vIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCB0YWtlcyBjYXJl IG9mIHRoaXMgY29udGVudCB0b28gYXMgc29tZSBpbmxpbmUgaXRlbXMgaGF2ZSBhbHJlYWR5IGJl ZW4gY29uc3RydWN0ZWQgZm9yIHRoaXMgdGV4dC4KICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgYXV0byBub25XaGl0ZVNwYWNlTGVuZ3RoID0gbW92ZVRvTmV4dEJyZWFrYWJsZVBv c2l0aW9uKGluaXRpYWxOb25XaGl0ZXNwYWNlUG9zaXRpb24sIGxpbmVCcmVha0l0ZXJhdG9yLCBz dHlsZSk7Ci0gICAgICAgICAgICBBU1NFUlQobm9uV2hpdGVTcGFjZUxlbmd0aCk7Ci0gICAgICAg ICAgICBjdXJyZW50UG9zaXRpb24gKz0gbm9uV2hpdGVTcGFjZUxlbmd0aDsKLSAgICAgICAgICAg IGhhc1RyYWlsaW5nU29mdEh5cGhlbiA9IGlzQXRTb2Z0SHlwaGVuKGN1cnJlbnRQb3NpdGlvbiAt IDEpOwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChpbml0aWFsTm9uV2hpdGVzcGFjZVBvc2l0 aW9uIDwgY3VycmVudFBvc2l0aW9uKTsKLSAgICAgICAgQVNTRVJUX0lNUExJRVMoc3R5bGUuaHlw aGVucygpID09IEh5cGhlbnM6Ok5vbmUsICFoYXNUcmFpbGluZ1NvZnRIeXBoZW4pOwotICAgICAg ICBhdXRvIGxlbmd0aCA9IGN1cnJlbnRQb3NpdGlvbiAtIGluaXRpYWxOb25XaGl0ZXNwYWNlUG9z aXRpb247Ci0gICAgICAgIGlubGluZUl0ZW1zLmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRl Tm9uV2hpdGVzcGFjZUl0ZW0oaW5saW5lVGV4dEJveCwgaW5pdGlhbE5vbldoaXRlc3BhY2VQb3Np dGlvbiwgbGVuZ3RoLCBVQklESV9ERUZBVUxUX0xUUiwgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBp bmxpbmVJdGVtV2lkdGgoaW5pdGlhbE5vbldoaXRlc3BhY2VQb3NpdGlvbiwgbGVuZ3RoKSkpOwor I2VuZGlmCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfTsKKyAgICAgICAgaWYg KGhhbmRsZU5vbldoaXRlc3BhY2UoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAv LyBVbnN1cHBvcnRlZCBjb250ZW50PworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICB9CiB9CiAKQEAgLTMxNSwyNSArMzU0LDggQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6Omhh bmRsZUlubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYKIAog dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gs IFVDaGFyIGNvbnRyb2xDaGFyYWN0ZXIsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykK IHsKLSAgICBpZiAobV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkpIHsKLSAgICAg ICAgLy8gRklYTUU6IE1vdmUgdGhpcyB0byBhIGRlZGljYXRlZCBmdW5jdGlvbiB0byBzdXBwb3J0 IGNvbnRyb2wgY2hhcmFjdGVycyBlbWJlZGRlZCBpbiB0ZXh0IGNvbnRlbnQuCi0gICAgICAgIGF1 dG8gYnVpbGRQcmV2aW91c1RleHRDb250ZW50ID0gWyZdIHsKLSAgICAgICAgICAgIGNvbnN0IEJv eCogbGFzdExheW91dEJveCA9IG51bGxwdHI7Ci0gICAgICAgICAgICBmb3IgKGF1dG8mIGlubGlu ZUl0ZW0gOiBpbmxpbmVJdGVtcykgewotICAgICAgICAgICAgICAgIGlmICghaW5saW5lSXRlbS5p c1RleHQoKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAg YXV0byYgbGF5b3V0Qm94ID0gaW5saW5lSXRlbS5sYXlvdXRCb3goKTsKLSAgICAgICAgICAgICAg ICBpZiAobGFzdExheW91dEJveCA9PSAmbGF5b3V0Qm94KSB7Ci0gICAgICAgICAgICAgICAgICAg IC8vIFdlJ3ZlIGFscmVhZHkgYXBwZW5kZWQgdGhpcyBjb250ZW50LgotICAgICAgICAgICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgbV9jb250 ZW50T2Zmc2V0TWFwLnNldCgmbGF5b3V0Qm94LCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmxl bmd0aCgpKTsKLSAgICAgICAgICAgICAgICBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmFwcGVu ZChkb3duY2FzdDxJbmxpbmVUZXh0Qm94PihsYXlvdXRCb3gpLmNvbnRlbnQoKSk7Ci0gICAgICAg ICAgICAgICAgbGFzdExheW91dEJveCA9ICZsYXlvdXRCb3g7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH07Ci0gICAgICAgIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCgpOwotICAgIH0KKyAgICBp ZiAobV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkpCisgICAgICAgIGJ1aWxkUHJl dmlvdXNUZXh0Q29udGVudChpbmxpbmVJdGVtcyk7CiAgICAgLy8gTGV0IHRoZSBmaXJzdCBjb250 cm9sIGNoYXJhY3RlciByZXByZXNlbnQgdGhlICBib3guCiAgICAgbV9jb250ZW50T2Zmc2V0TWFw LmFkZCgmYm94LCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpKTsKICAgICBtX3Bh cmFncmFwaENvbnRlbnRCdWlsZGVyLmFwcGVuZChjb250cm9sQ2hhcmFjdGVyKTsKQEAgLTM0NSw2 ICszNjcsMjYgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmV4aXRCaWRpQ29udGV4dChjb25z dCBCb3gmLCBVQ2hhciBjb250cm9sQ2hhcmFjdGVyKQogICAgIG1fcGFyYWdyYXBoQ29udGVudEJ1 aWxkZXIuYXBwZW5kKGNvbnRyb2xDaGFyYWN0ZXIpOwogfQogCit2b2lkIElubGluZUl0ZW1zQnVp bGRlcjo6YnVpbGRQcmV2aW91c1RleHRDb250ZW50KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJ dGVtcykKK3sKKyAgICBBU1NFUlQobV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkp OworICAgIEFTU0VSVChtX2NvbnRlbnRPZmZzZXRNYXAuaXNFbXB0eSgpKTsKKworICAgIGNvbnN0 IEJveCogbGFzdExheW91dEJveCA9IG51bGxwdHI7CisgICAgZm9yIChhdXRvJiBpbmxpbmVJdGVt IDogaW5saW5lSXRlbXMpIHsKKyAgICAgICAgaWYgKCFpbmxpbmVJdGVtLmlzVGV4dCgpKQorICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0u bGF5b3V0Qm94KCk7CisgICAgICAgIGlmIChsYXN0TGF5b3V0Qm94ID09ICZsYXlvdXRCb3gpIHsK KyAgICAgICAgICAgIC8vIFdlJ3ZlIGFscmVhZHkgYXBwZW5kZWQgdGhpcyBjb250ZW50LgorICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFw LnNldCgmbGF5b3V0Qm94LCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpKTsKKyAg ICAgICAgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5hcHBlbmQoZG93bmNhc3Q8SW5saW5lVGV4 dEJveD4obGF5b3V0Qm94KS5jb250ZW50KCkpOworICAgICAgICBsYXN0TGF5b3V0Qm94ID0gJmxh eW91dEJveDsKKyAgICB9Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVt c0J1aWxkZXIuaAppbmRleCA5YWJkNGI4OWJhYjJlMjNiOTY2MDQ3ZDQ4YTc4ZmFhOWQ2OGRlMDQ3 Li5hMjIwZGJmOWVmYjg1OGRmMmY4MDJkN2Q5YjU2NDUyODRmNjZiN2FiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVt c0J1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuaApAQCAtNTIsNiArNTIsOCBAQCBwcml2YXRlOgog ICAgIHZvaWQgZW50ZXJCaWRpQ29udGV4dChjb25zdCBCb3gmLCBVQ2hhciwgY29uc3QgSW5saW5l SXRlbXMmKTsKICAgICB2b2lkIGV4aXRCaWRpQ29udGV4dChjb25zdCBCb3gmLCBVQ2hhcik7CiAK KyAgICB2b2lkIGJ1aWxkUHJldmlvdXNUZXh0Q29udGVudChjb25zdCBJbmxpbmVJdGVtcyYpOwor CiAgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9yb290OyB9 CiAKICAgICBjb25zdCBDb250YWluZXJCb3gmIG1fcm9vdDsK