246964 2022-10-24 14:53:32 -0700 [LFC][IFC] LineBoxBuilder::setLayoutBounds should not call setAscentAndDescent 2022-10-26 10:13:24 -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 1907886 0 zalan 2022-10-24 14:53:32 -0700 ssia 1907890 1 463204 zalan 2022-10-24 14:58:50 -0700 Created attachment 463204 Patch 1908135 2 463223 zalan 2022-10-25 09:43:35 -0700 Created attachment 463223 Patch 1908146 3 463224 zalan 2022-10-25 10:10:30 -0700 Created attachment 463224 Patch 1908184 4 463233 zalan 2022-10-25 12:34:11 -0700 Created attachment 463233 Patch 1908462 5 ews-feeder 2022-10-26 10:12:12 -0700 Committed 256023@main (e48a49d4713e): <https://commits.webkit.org/256023@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 463233. 1908464 6 webkit-bug-importer 2022-10-26 10:13:24 -0700 <rdar://problem/101593451> 463204 2022-10-24 14:58:50 -0700 2022-10-25 09:43:33 -0700 Patch bug-246964-20221024145849.patch text/plain 7389 zalan RnJvbSA1NWViNzg1NjJlOWNmZDFlZTBkMmZiNmJmNTFhNTVkMThkNDdjNWY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBN b24sIDI0IE9jdCAyMDIyIDE0OjU2OjA4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRzIHNob3VsZCBub3QgY2FsbAogc2V0QXNj ZW50QW5kRGVzY2VudCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ2 OTY0CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24g Zm9yIHN1cHBvcnQgbGluZS1ib3gtY29udGFpbi4KKHNldExheW91dEJvdW5kcyBzaG91bGQgcmVh bGx5IGp1c3QgY29tcHV0ZSBhbmQgc2V0IHRoZSBsYXlvdXQgYm91bmRzKS4KCiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxk ZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRz IGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRl b2dyYXBoaWNCYXNlbGluZUlmQXBwbGljYWJsZSk6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5l Qm94QnVpbGRlci5jcHAgICAgICAgICAgIHwgMzYgKysrKysrKysrKysrLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAppbmRleCA5NDM0Nzk5OThmMmYuLmE5 NTAyMGFiYTgzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVy LmNwcApAQCAtMjI4LDcgKzIyOCw2IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OnNldExheW91dEJv dW5kcyhJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gsIGNvbnN0IFRleHRNCiAgICAgICAg IGhhbGZMZWFkaW5nID0gKHRleHRNZXRyaWNzLmxpbmVTcGFjaW5nIC0gbG9naWNhbEhlaWdodCkg LyAyOwogICAgIH0KICAgICBpbmxpbmVMZXZlbEJveC5zZXRMYXlvdXRCb3VuZHMoeyBmbG9vcmYo dGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5hc2NlbnQgKyBoYWxmTGVhZGluZyksIGNlaWxm KHRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCArIGhhbGZMZWFkaW5nKSB9KTsK LSAgICBzZXRBc2NlbnRBbmREZXNjZW50KGlubGluZUxldmVsQm94LCB0ZXh0TWV0cmljcy5hc2Nl bnRBbmREZXNjZW50KTsKIH0KIAogdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0QXNjZW50QW5kRGVz Y2VudChJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gsIEFzY2VudEFuZERlc2NlbnQgYXNj ZW50QW5kRGVzY2VudCkgY29uc3QKQEAgLTI0Miw3ICsyNDEsOSBAQCB2b2lkIExpbmVCb3hCdWls ZGVyOjpzZXRBc2NlbnRBbmREZXNjZW50KElubGluZUxldmVsQm94JiBpbmxpbmVMZXZlbEJveCwg QXNjZW50QQogdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhM aW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250 ZW50LCBzaXplX3QgbGluZUluZGV4KQogewogICAgIGF1dG8mIHJvb3RJbmxpbmVCb3ggPSBsaW5l Qm94LnJvb3RJbmxpbmVCb3goKTsKLSAgICBzZXRMYXlvdXRCb3VuZHMocm9vdElubGluZUJveCwg cHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KHJvb3RJbmxpbmVCb3gpKTsKKyAgICBhdXRv IHJvb3RJbmxpbmVCb3hUZXh0TWV0cmljcyA9IHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJv eChyb290SW5saW5lQm94KTsKKyAgICBzZXRMYXlvdXRCb3VuZHMocm9vdElubGluZUJveCwgcm9v dElubGluZUJveFRleHRNZXRyaWNzKTsKKyAgICBzZXRBc2NlbnRBbmREZXNjZW50KHJvb3RJbmxp bmVCb3gsIHJvb3RJbmxpbmVCb3hUZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50KTsKIAogICAg IGF1dG8gc3R5bGVUb1VzZSA9IFsmXSAoY29uc3QgYXV0byYgbGF5b3V0Qm94KSAtPiBjb25zdCBS ZW5kZXJTdHlsZSYgewogICAgICAgICByZXR1cm4gIWxpbmVJbmRleCA/IGxheW91dEJveC5maXJz dExpbmVTdHlsZSgpIDogbGF5b3V0Qm94LnN0eWxlKCk7CkBAIC0zMDksOSArMzEwLDEwIEBAIHZv aWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGlu ZUJveCwgY29uc3QgTGluZUJ1aWxkCiAgICAgICAgICAgICBsb2dpY2FsTGVmdCArPSBzdGQ6Om1h eCgwX2x1LCBsaXN0TWFya2VyQm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSk7CiAgICAgICAgICAg ICBhdXRvIGxpc3RNYXJrZXJJbmxpbmVMZXZlbEJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVB dG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgeyBsaXN0 TWFya2VyQm94R2VvbWV0cnkuYm9yZGVyQm94V2lkdGgoKSwgbWFyZ2luQm94SGVpZ2h0IH0pOwog Ci0gICAgICAgICAgICBpZiAoYXV0byBhc2NlbnQgPSBkb3duY2FzdDxFbGVtZW50Qm94PihsYXlv dXRCb3gpLmJhc2VsaW5lRm9ySW50ZWdyYXRpb24oKSkKKyAgICAgICAgICAgIGlmIChhdXRvIGFz Y2VudCA9IGRvd25jYXN0PEVsZW1lbnRCb3g+KGxheW91dEJveCkuYmFzZWxpbmVGb3JJbnRlZ3Jh dGlvbigpKSB7CiAgICAgICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGxpc3RNYXJrZXJJbmxp bmVMZXZlbEJveCwgeyB7ICphc2NlbnQsIG1hcmdpbkJveEhlaWdodCAtICphc2NlbnQgfSwgeyB9 LCB7IH0gfSk7Ci0gICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBzZXRBc2NlbnRB bmREZXNjZW50KGxpc3RNYXJrZXJJbmxpbmVMZXZlbEJveCwgeyAqYXNjZW50LCBtYXJnaW5Cb3hI ZWlnaHQgLSAqYXNjZW50IH0pOworICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAg ICBzZXRBc2NlbnRBbmREZXNjZW50KGxpc3RNYXJrZXJJbmxpbmVMZXZlbEJveCwgeyBtYXJnaW5C b3hIZWlnaHQsIHsgfSB9KTsKICAgICAgICAgICAgICAgICBsaXN0TWFya2VySW5saW5lTGV2ZWxC b3guc2V0TGF5b3V0Qm91bmRzKHsgbWFyZ2luQm94SGVpZ2h0LCB7IH0gfSk7CiAgICAgICAgICAg ICB9CkBAIC0zMjcsNyArMzI5LDkgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQKICAgICAgICAg ICAgIGF1dG8gYWRqdXN0ZWRMb2dpY2FsU3RhcnQgPSBsb2dpY2FsTGVmdCArIHN0ZDo6bWF4KDAu MGYsIG1hcmdpblN0YXJ0KTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0gcm9vdElu bGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIGFkanVzdGVkTG9naWNhbFN0YXJ0OwogICAgICAgICAg ICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KGxheW91 dEJveCwgc3R5bGUsIGFkanVzdGVkTG9naWNhbFN0YXJ0LCBsb2dpY2FsV2lkdGgsIElubGluZUxl dmVsQm94OjpMaW5lU3Bhbm5pbmdJbmxpbmVCb3g6Olllcyk7Ci0gICAgICAgICAgICBzZXRMYXlv dXRCb3VuZHMoaW5saW5lQm94LCBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3goaW5saW5l Qm94KSk7CisgICAgICAgICAgICBhdXRvIHRleHRNZXRyaWNzID0gcHJpbWFyeUZvbnRNZXRyaWNz Rm9ySW5saW5lQm94KGlubGluZUJveCk7CisgICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMoaW5s aW5lQm94LCB0ZXh0TWV0cmljcyk7CisgICAgICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KGlu bGluZUJveCwgdGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudCk7CiAgICAgICAgICAgICBsaW5l Qm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94KSk7CiAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgfQpAQCAtMzQyLDcgKzM0Niw5IEBAIHZvaWQgTGluZUJveEJ1aWxk ZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGlu ZUJ1aWxkCiAgICAgICAgICAgICBpbml0aWFsTG9naWNhbFdpZHRoID0gc3RkOjptYXgoaW5pdGlh bExvZ2ljYWxXaWR0aCwgMC5mKTsKICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gSW5saW5l TGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwg aW5pdGlhbExvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAgICBpbmxpbmVCb3guc2V0SXNGaXJzdEJv eCgpOwotICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGlubGluZUJveCwgcHJpbWFyeUZvbnRN ZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUJveCkpOworICAgICAgICAgICAgYXV0byB0ZXh0TWV0 cmljcyA9IHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxpbmVCb3gpOworICAgICAg ICAgICAgc2V0TGF5b3V0Qm91bmRzKGlubGluZUJveCwgdGV4dE1ldHJpY3MpOworICAgICAgICAg ICAgc2V0QXNjZW50QW5kRGVzY2VudChpbmxpbmVCb3gsIHRleHRNZXRyaWNzLmFzY2VudEFuZERl c2NlbnQpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlu bGluZUJveCkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KQEAgLTM3Nyw3ICsz ODMsOSBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExp bmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmVCdWlsZAogICAgICAgICB9CiAgICAgICAgIGlmIChy dW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIGF1dG8gbGluZUJyZWFrQm94ID0g SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxpbmVCcmVha0JveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dp Y2FsTGVmdCk7Ci0gICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMobGluZUJyZWFrQm94LCBwcmlt YXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3gobGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91 dEJveChsYXlvdXRCb3gucGFyZW50KCkpKSk7CisgICAgICAgICAgICBhdXRvIHRleHRNZXRyaWNz ID0gcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGxpbmVCb3guaW5saW5lTGV2ZWxCb3hG b3JMYXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKSk7CisgICAgICAgICAgICBzZXRMYXlvdXRC b3VuZHMobGluZUJyZWFrQm94LCB0ZXh0TWV0cmljcyk7CisgICAgICAgICAgICBzZXRBc2NlbnRB bmREZXNjZW50KGxpbmVCcmVha0JveCwgdGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudCk7CiAg ICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUobGluZUJyZWFrQm94 KSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtNDI4LDExICs0MzYsMTUg QEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRlb2dyYXBoaWNCYXNlbGluZUlmQXBwbGlj YWJsZShMaW5lQm94JiBsaW5lQm94LCBzaXoKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAg ICBhdXRvIGJlaGF2ZXNBc1RleHQgPSBpbmxpbmVMZXZlbEJveC5pc0xpbmVCcmVha0JveCgpIHx8 IChpbmxpbmVMZXZlbEJveC5pc0xpc3RNYXJrZXIoKSAmJiAhZG93bmNhc3Q8RWxlbWVudEJveD4o aW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkpLmlzTGlzdE1hcmtlckltYWdlKCkpOwotICAgICAg ICBpZiAoYmVoYXZlc0FzVGV4dCkKLSAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhpbmxpbmVM ZXZlbEJveCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGxpbmVCb3guaW5saW5lTGV2 ZWxCb3hGb3JMYXlvdXRCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkucGFyZW50KCkpLCBJ ZGVvZ3JhcGhpY0Jhc2VsaW5lKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlubGluZUxldmVsQm94Lmlz SW5saW5lQm94KCkpCi0gICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxCb3gs IHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxpbmVMZXZlbEJveCwgSWRlb2dyYXBo aWNCYXNlbGluZSkpOwotICAgICAgICBlbHNlIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lu bGluZUxldmVsQm94KCkpIHsKKyAgICAgICAgaWYgKGJlaGF2ZXNBc1RleHQpIHsKKyAgICAgICAg ICAgIGF1dG8gdGV4dE1ldHJpY3MgPSBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3gobGlu ZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3go KS5wYXJlbnQoKSksIElkZW9ncmFwaGljQmFzZWxpbmUpOworICAgICAgICAgICAgc2V0TGF5b3V0 Qm91bmRzKGlubGluZUxldmVsQm94LCB0ZXh0TWV0cmljcyk7CisgICAgICAgICAgICBzZXRBc2Nl bnRBbmREZXNjZW50KGlubGluZUxldmVsQm94LCB0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50 KTsKKyAgICAgICAgfSBlbHNlIGlmIChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpKSB7Cisg ICAgICAgICAgICBhdXRvIHRleHRNZXRyaWNzID0gcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5l Qm94KGlubGluZUxldmVsQm94LCBJZGVvZ3JhcGhpY0Jhc2VsaW5lKTsKKyAgICAgICAgICAgIHNl dExheW91dEJvdW5kcyhpbmxpbmVMZXZlbEJveCwgdGV4dE1ldHJpY3MpOworICAgICAgICAgICAg c2V0QXNjZW50QW5kRGVzY2VudChpbmxpbmVMZXZlbEJveCwgdGV4dE1ldHJpY3MuYXNjZW50QW5k RGVzY2VudCk7CisgICAgICAgIH0gZWxzZSBpZiAoaW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxp bmVMZXZlbEJveCgpKSB7CiAgICAgICAgICAgICBhdXRvIGlubGluZUxldmVsQm94SGVpZ2h0ID0g aW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCk7CiAgICAgICAgICAgICBJbmxp bmVMYXlvdXRVbml0IGlkZW9ncmFwaGljQmFzZWxpbmUgPSByb3VuZFRvSW50KGlubGluZUxldmVs Qm94SGVpZ2h0IC8gMik7CiAgICAgICAgICAgICAvLyBNb3ZlIHRoZSBiYXNlbGluZSBwb3NpdGlv biBidXQga2VlcCB0aGUgc2FtZSBsb2dpY2FsIGhlaWdodC4K 463223 2022-10-25 09:43:35 -0700 2022-10-25 10:10:28 -0700 Patch bug-246964-20221025094334.patch text/plain 7937 zalan RnJvbSA5MTYwYWI1NDNiNGMxYjRmOWI4OTQ5M2Q3N2RhYTE5MGNkMDYwZDA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU dWUsIDI1IE9jdCAyMDIyIDA5OjQyOjQ5IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRzIHNob3VsZCBub3QgY2FsbAogc2V0QXNj ZW50QW5kRGVzY2VudCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ2 OTY0CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24g Zm9yIHN1cHBvcnQgbGluZS1ib3gtY29udGFpbi4KKHNldExheW91dEJvdW5kcyBzaG91bGQgcmVh bGx5IGp1c3QgY29tcHV0ZSBhbmQgc2V0IHRoZSBsYXlvdXQgYm91bmRzKS4KCiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxk ZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRz IGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRl b2dyYXBoaWNCYXNlbGluZUlmQXBwbGljYWJsZSk6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5l Qm94QnVpbGRlci5jcHAgICAgICAgICAgIHwgMzcgKysrKysrKysrKysrLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAppbmRleCA2MDhjZGUyZmFhMTAuLmE1 MGE3YWExMDk0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVy LmNwcApAQCAtMjI4LDggKzIyOCw2IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OnNldExheW91dEJv dW5kcyhJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gsIGNvbnN0IFRleHRNCiAgICAgICAg IGhhbGZMZWFkaW5nID0gKHRleHRNZXRyaWNzLmxpbmVTcGFjaW5nIC0gbG9naWNhbEhlaWdodCkg LyAyOwogICAgIH0KICAgICBpbmxpbmVMZXZlbEJveC5zZXRMYXlvdXRCb3VuZHMoeyBmbG9vcmYo dGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5hc2NlbnQgKyBoYWxmTGVhZGluZyksIGNlaWxm KHRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCArIGhhbGZMZWFkaW5nKSB9KTsK LSAgICAvLyBXZSBuZWVkIGZsb29yL2NlaWwgdG8gbWF0Y2ggbGVnYWN5IGxheW91dCBpbnRlZ3Jh bCBwb3NpdGlvbmluZy4KLSAgICBzZXRBc2NlbnRBbmREZXNjZW50KGlubGluZUxldmVsQm94LCB7 IGZsb29yZih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCksIGNlaWxmKHRleHRN ZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCkgfSk7CiB9CiAKIHZvaWQgTGluZUJveEJ1 aWxkZXI6OnNldEFzY2VudEFuZERlc2NlbnQoSW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94 LCBBc2NlbnRBbmREZXNjZW50IGFzY2VudEFuZERlc2NlbnQpIGNvbnN0CkBAIC0yNDIsNyArMjQw LDkgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0QXNjZW50QW5kRGVzY2VudChJbmxpbmVMZXZl bEJveCYgaW5saW5lTGV2ZWxCb3gsIEFzY2VudEEKIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0 cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZUJ1aWxkZXI6 OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCwgc2l6ZV90IGxpbmVJbmRleCkKIHsKICAgICBhdXRv JiByb290SW5saW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94KCk7Ci0gICAgc2V0TGF5b3V0 Qm91bmRzKHJvb3RJbmxpbmVCb3gsIHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChyb290 SW5saW5lQm94KSk7CisgICAgYXV0byByb290SW5saW5lQm94VGV4dE1ldHJpY3MgPSBwcmltYXJ5 Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3gocm9vdElubGluZUJveCk7CisgICAgc2V0TGF5b3V0Qm91 bmRzKHJvb3RJbmxpbmVCb3gsIHJvb3RJbmxpbmVCb3hUZXh0TWV0cmljcyk7CisgICAgc2V0QXNj ZW50QW5kRGVzY2VudChyb290SW5saW5lQm94LCB7IGZsb29yZihyb290SW5saW5lQm94VGV4dE1l dHJpY3MuYXNjZW50QW5kRGVzY2VudC5hc2NlbnQpLCBjZWlsZihyb290SW5saW5lQm94VGV4dE1l dHJpY3MuYXNjZW50QW5kRGVzY2VudC5kZXNjZW50KSB9KTsKIAogICAgIGF1dG8gc3R5bGVUb1Vz ZSA9IFsmXSAoY29uc3QgYXV0byYgbGF5b3V0Qm94KSAtPiBjb25zdCBSZW5kZXJTdHlsZSYgewog ICAgICAgICByZXR1cm4gIWxpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHlsZSgpIDog bGF5b3V0Qm94LnN0eWxlKCk7CkBAIC0zMDksOSArMzA5LDEwIEBAIHZvaWQgTGluZUJveEJ1aWxk ZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGlu ZUJ1aWxkCiAgICAgICAgICAgICBsb2dpY2FsTGVmdCArPSBzdGQ6Om1heCgwX2x1LCBsaXN0TWFy a2VyQm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSk7CiAgICAgICAgICAgICBhdXRvIGxpc3RNYXJr ZXJJbmxpbmVMZXZlbEJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZl bEJveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgeyBsaXN0TWFya2VyQm94R2VvbWV0 cnkuYm9yZGVyQm94V2lkdGgoKSwgbWFyZ2luQm94SGVpZ2h0IH0pOwogCi0gICAgICAgICAgICBp ZiAoYXV0byBhc2NlbnQgPSBkb3duY2FzdDxFbGVtZW50Qm94PihsYXlvdXRCb3gpLmJhc2VsaW5l Rm9ySW50ZWdyYXRpb24oKSkKKyAgICAgICAgICAgIGlmIChhdXRvIGFzY2VudCA9IGRvd25jYXN0 PEVsZW1lbnRCb3g+KGxheW91dEJveCkuYmFzZWxpbmVGb3JJbnRlZ3JhdGlvbigpKSB7CiAgICAg ICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGxpc3RNYXJrZXJJbmxpbmVMZXZlbEJveCwgeyB7 ICphc2NlbnQsIG1hcmdpbkJveEhlaWdodCAtICphc2NlbnQgfSwgeyB9LCB7IH0gfSk7Ci0gICAg ICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KGxpc3RN YXJrZXJJbmxpbmVMZXZlbEJveCwgeyBmbG9vcmYoKmFzY2VudCksIGNlaWxmKG1hcmdpbkJveEhl aWdodCAtICphc2NlbnQpIH0pOworICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAg ICBzZXRBc2NlbnRBbmREZXNjZW50KGxpc3RNYXJrZXJJbmxpbmVMZXZlbEJveCwgeyBtYXJnaW5C b3hIZWlnaHQsIHsgfSB9KTsKICAgICAgICAgICAgICAgICBsaXN0TWFya2VySW5saW5lTGV2ZWxC b3guc2V0TGF5b3V0Qm91bmRzKHsgbWFyZ2luQm94SGVpZ2h0LCB7IH0gfSk7CiAgICAgICAgICAg ICB9CkBAIC0zMjcsNyArMzI4LDkgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQKICAgICAgICAg ICAgIGF1dG8gYWRqdXN0ZWRMb2dpY2FsU3RhcnQgPSBsb2dpY2FsTGVmdCArIHN0ZDo6bWF4KDAu MGYsIG1hcmdpblN0YXJ0KTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0gcm9vdElu bGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIGFkanVzdGVkTG9naWNhbFN0YXJ0OwogICAgICAgICAg ICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KGxheW91 dEJveCwgc3R5bGUsIGFkanVzdGVkTG9naWNhbFN0YXJ0LCBsb2dpY2FsV2lkdGgsIElubGluZUxl dmVsQm94OjpMaW5lU3Bhbm5pbmdJbmxpbmVCb3g6Olllcyk7Ci0gICAgICAgICAgICBzZXRMYXlv dXRCb3VuZHMoaW5saW5lQm94LCBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3goaW5saW5l Qm94KSk7CisgICAgICAgICAgICBhdXRvIHRleHRNZXRyaWNzID0gcHJpbWFyeUZvbnRNZXRyaWNz Rm9ySW5saW5lQm94KGlubGluZUJveCk7CisgICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMoaW5s aW5lQm94LCB0ZXh0TWV0cmljcyk7CisgICAgICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KGlu bGluZUJveCwgeyBmbG9vcmYodGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5hc2NlbnQpLCBj ZWlsZih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmRlc2NlbnQpIH0pOwogICAgICAgICAg ICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KQEAgLTM0Miw3ICszNDUsOSBAQCB2b2lkIExpbmVC b3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNv bnN0IExpbmVCdWlsZAogICAgICAgICAgICAgaW5pdGlhbExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWF4 KGluaXRpYWxMb2dpY2FsV2lkdGgsIDAuZik7CiAgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9 IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5b3V0Qm94LCBzdHlsZSwgbG9naWNh bExlZnQsIGluaXRpYWxMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAgaW5saW5lQm94LnNldElz Rmlyc3RCb3goKTsKLSAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhpbmxpbmVCb3gsIHByaW1h cnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxpbmVCb3gpKTsKKyAgICAgICAgICAgIGF1dG8g dGV4dE1ldHJpY3MgPSBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3goaW5saW5lQm94KTsK KyAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhpbmxpbmVCb3gsIHRleHRNZXRyaWNzKTsKKyAg ICAgICAgICAgIHNldEFzY2VudEFuZERlc2NlbnQoaW5saW5lQm94LCB7IGZsb29yZih0ZXh0TWV0 cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCksIGNlaWxmKHRleHRNZXRyaWNzLmFzY2VudEFu ZERlc2NlbnQuZGVzY2VudCkgfSk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVs Qm94KFdURk1vdmUoaW5saW5lQm94KSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg fQpAQCAtMzc3LDcgKzM4Miw5IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZUJ1aWxkCiAgICAgICAgIH0K ICAgICAgICAgaWYgKHJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgYXV0byBs aW5lQnJlYWtCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlTGluZUJyZWFrQm94KGxheW91dEJv eCwgc3R5bGUsIGxvZ2ljYWxMZWZ0KTsKLSAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhsaW5l QnJlYWtCb3gsIHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChsaW5lQm94LmlubGluZUxl dmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveC5wYXJlbnQoKSkpKTsKKyAgICAgICAgICAgIGF1 dG8gdGV4dE1ldHJpY3MgPSBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3gobGluZUJveC5p bmxpbmVMZXZlbEJveEZvckxheW91dEJveChsYXlvdXRCb3gucGFyZW50KCkpKTsKKyAgICAgICAg ICAgIHNldExheW91dEJvdW5kcyhsaW5lQnJlYWtCb3gsIHRleHRNZXRyaWNzKTsKKyAgICAgICAg ICAgIHNldEFzY2VudEFuZERlc2NlbnQobGluZUJyZWFrQm94LCB7IGZsb29yZih0ZXh0TWV0cmlj cy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCksIGNlaWxmKHRleHRNZXRyaWNzLmFzY2VudEFuZERl c2NlbnQuZGVzY2VudCkgfSk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94 KFdURk1vdmUobGluZUJyZWFrQm94KSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg fQpAQCAtNDI4LDExICs0MzUsMTUgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRlb2dy YXBoaWNCYXNlbGluZUlmQXBwbGljYWJsZShMaW5lQm94JiBsaW5lQm94LCBzaXoKICAgICAgICAg ICAgIHJldHVybjsKIAogICAgICAgICBhdXRvIGJlaGF2ZXNBc1RleHQgPSBpbmxpbmVMZXZlbEJv eC5pc0xpbmVCcmVha0JveCgpIHx8IChpbmxpbmVMZXZlbEJveC5pc0xpc3RNYXJrZXIoKSAmJiAh ZG93bmNhc3Q8RWxlbWVudEJveD4oaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkpLmlzTGlzdE1h cmtlckltYWdlKCkpOwotICAgICAgICBpZiAoYmVoYXZlc0FzVGV4dCkKLSAgICAgICAgICAgIHNl dExheW91dEJvdW5kcyhpbmxpbmVMZXZlbEJveCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5l Qm94KGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goaW5saW5lTGV2ZWxCb3gubGF5 b3V0Qm94KCkucGFyZW50KCkpLCBJZGVvZ3JhcGhpY0Jhc2VsaW5lKSk7Ci0gICAgICAgIGVsc2Ug aWYgKGlubGluZUxldmVsQm94LmlzSW5saW5lQm94KCkpCi0gICAgICAgICAgICBzZXRMYXlvdXRC b3VuZHMoaW5saW5lTGV2ZWxCb3gsIHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxp bmVMZXZlbEJveCwgSWRlb2dyYXBoaWNCYXNlbGluZSkpOwotICAgICAgICBlbHNlIGlmIChpbmxp bmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKKyAgICAgICAgaWYgKGJlaGF2 ZXNBc1RleHQpIHsKKyAgICAgICAgICAgIGF1dG8gdGV4dE1ldHJpY3MgPSBwcmltYXJ5Rm9udE1l dHJpY3NGb3JJbmxpbmVCb3gobGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxp bmVMZXZlbEJveC5sYXlvdXRCb3goKS5wYXJlbnQoKSksIElkZW9ncmFwaGljQmFzZWxpbmUpOwor ICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGlubGluZUxldmVsQm94LCB0ZXh0TWV0cmljcyk7 CisgICAgICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KGlubGluZUxldmVsQm94LCB7IGZsb29y Zih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCksIGNlaWxmKHRleHRNZXRyaWNz LmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCkgfSk7CisgICAgICAgIH0gZWxzZSBpZiAoaW5saW5l TGV2ZWxCb3guaXNJbmxpbmVCb3goKSkgeworICAgICAgICAgICAgYXV0byB0ZXh0TWV0cmljcyA9 IHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxpbmVMZXZlbEJveCwgSWRlb2dyYXBo aWNCYXNlbGluZSk7CisgICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxCb3gs IHRleHRNZXRyaWNzKTsKKyAgICAgICAgICAgIHNldEFzY2VudEFuZERlc2NlbnQoaW5saW5lTGV2 ZWxCb3gsIHsgZmxvb3JmKHRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuYXNjZW50KSwgY2Vp bGYodGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5kZXNjZW50KSB9KTsKKyAgICAgICAgfSBl bHNlIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKICAgICAg ICAgICAgIGF1dG8gaW5saW5lTGV2ZWxCb3hIZWlnaHQgPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRC b3VuZHMoKS5oZWlnaHQoKTsKICAgICAgICAgICAgIElubGluZUxheW91dFVuaXQgaWRlb2dyYXBo aWNCYXNlbGluZSA9IHJvdW5kVG9JbnQoaW5saW5lTGV2ZWxCb3hIZWlnaHQgLyAyKTsKICAgICAg ICAgICAgIC8vIE1vdmUgdGhlIGJhc2VsaW5lIHBvc2l0aW9uIGJ1dCBrZWVwIHRoZSBzYW1lIGxv Z2ljYWwgaGVpZ2h0Lgo= 463224 2022-10-25 10:10:30 -0700 2022-10-25 12:34:07 -0700 Patch bug-246964-20221025101029.patch text/plain 15491 zalan RnJvbSBlZGMwZmIzZjYwMjFmODBjZDc1MzRiNDA4ODY4YTZmMjY2Y2U4NjE0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU dWUsIDI1IE9jdCAyMDIyIDA5OjQyOjQ5IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRzIHNob3VsZCBub3QgY2FsbAogc2V0QXNj ZW50QW5kRGVzY2VudCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ2 OTY0CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24g Zm9yIHN1cHBvcnQgbGluZS1ib3gtY29udGFpbi4KKHNldExheW91dEJvdW5kcyBzaG91bGQgcmVh bGx5IGp1c3QgY29tcHV0ZSBhbmQgc2V0IHRoZSBsYXlvdXQgYm91bmRzKS4KCiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxk ZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0Qm91bmRz IGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRl b2dyYXBoaWNCYXNlbGluZUlmQXBwbGljYWJsZSk6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5l Qm94QnVpbGRlci5jcHAgICAgICAgICAgIHwgMTI4ICsrKysrKysrKysrLS0tLS0tLQogLi4uL2lu bGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oICAgICAgICAgICAgIHwgICAzICstCiAyIGZpbGVz IGNoYW5nZWQsIDgzIGluc2VydGlvbnMoKyksIDQ4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAppbmRleCA2MDhjZGUyZmFhMTAuLmEz ODMwY2ZjYTViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVy LmNwcApAQCAtMjI4LDIxICsyMjgsODcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0 Qm91bmRzKElubGluZUxldmVsQm94JiBpbmxpbmVMZXZlbEJveCwgY29uc3QgVGV4dE0KICAgICAg ICAgaGFsZkxlYWRpbmcgPSAodGV4dE1ldHJpY3MubGluZVNwYWNpbmcgLSBsb2dpY2FsSGVpZ2h0 KSAvIDI7CiAgICAgfQogICAgIGlubGluZUxldmVsQm94LnNldExheW91dEJvdW5kcyh7IGZsb29y Zih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCArIGhhbGZMZWFkaW5nKSwgY2Vp bGYodGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5kZXNjZW50ICsgaGFsZkxlYWRpbmcpIH0p OwotICAgIC8vIFdlIG5lZWQgZmxvb3IvY2VpbCB0byBtYXRjaCBsZWdhY3kgbGF5b3V0IGludGVn cmFsIHBvc2l0aW9uaW5nLgotICAgIHNldEFzY2VudEFuZERlc2NlbnQoaW5saW5lTGV2ZWxCb3gs IHsgZmxvb3JmKHRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuYXNjZW50KSwgY2VpbGYodGV4 dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5kZXNjZW50KSB9KTsKIH0KIAotdm9pZCBMaW5lQm94 QnVpbGRlcjo6c2V0QXNjZW50QW5kRGVzY2VudChJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxC b3gsIEFzY2VudEFuZERlc2NlbnQgYXNjZW50QW5kRGVzY2VudCkgY29uc3QKK3ZvaWQgTGluZUJv eEJ1aWxkZXI6OnNldFZlcnRpY2FsUHJvcGVydGllc0ZvcklubGluZUxldmVsQm94KGNvbnN0IExp bmVCb3gmIGxpbmVCb3gsIElubGluZUxldmVsQm94JiBpbmxpbmVMZXZlbEJveCkgY29uc3QKIHsK LSAgICBpbmxpbmVMZXZlbEJveC5zZXRBc2NlbnQoYXNjZW50QW5kRGVzY2VudC5hc2NlbnQpOwot ICAgIGlubGluZUxldmVsQm94LnNldERlc2NlbnQoYXNjZW50QW5kRGVzY2VudC5kZXNjZW50KTsK LSAgICBpbmxpbmVMZXZlbEJveC5zZXRMb2dpY2FsSGVpZ2h0KGFzY2VudEFuZERlc2NlbnQuYXNj ZW50ICsgYXNjZW50QW5kRGVzY2VudC5kZXNjZW50KTsKKyAgICBhdXRvIHNldEFzY2VudEFuZERl c2NlbnQgPSBbJl0gKGF1dG8gYXNjZW50QW5kRGVzY2VudCkgeworICAgICAgICBpbmxpbmVMZXZl bEJveC5zZXRBc2NlbnQoYXNjZW50QW5kRGVzY2VudC5hc2NlbnQpOworICAgICAgICBpbmxpbmVM ZXZlbEJveC5zZXREZXNjZW50KGFzY2VudEFuZERlc2NlbnQuZGVzY2VudCk7CisgICAgICAgIGlu bGluZUxldmVsQm94LnNldExvZ2ljYWxIZWlnaHQoYXNjZW50QW5kRGVzY2VudC5hc2NlbnQgKyBh c2NlbnRBbmREZXNjZW50LmRlc2NlbnQpOworICAgIH07CisKKyAgICBpZiAoaW5saW5lTGV2ZWxC b3guaXNJbmxpbmVCb3goKSkgeworICAgICAgICBhdXRvIHRleHRNZXRyaWNzID0gcHJpbWFyeUZv bnRNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94LCBsaW5lQm94LmJhc2VsaW5lVHlw ZSgpKTsKKyAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGlubGluZUxldmVsQm94LCB0ZXh0TWV0cmlj cyk7CisgICAgICAgIC8vIFdlIG5lZWQgZmxvb3IvY2VpbCB0byBtYXRjaCBsZWdhY3kgbGF5b3V0 IGludGVncmFsIHBvc2l0aW9uaW5nLgorICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KEFzY2Vu dEFuZERlc2NlbnQgeyBmbG9vcmYodGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5hc2NlbnQp LCBjZWlsZih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmRlc2NlbnQpIH0pOworICAgICAg ICByZXR1cm47CisgICAgfQorICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0xpbmVCcmVha0JveCgp KSB7CisgICAgICAgIGF1dG8gcGFyZW50VGV4dE1ldHJpY3MgPSBwcmltYXJ5Rm9udE1ldHJpY3NG b3JJbmxpbmVCb3gobGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxpbmVMZXZl bEJveC5sYXlvdXRCb3goKS5wYXJlbnQoKSksIGxpbmVCb3guYmFzZWxpbmVUeXBlKCkpOworICAg ICAgICBzZXRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxCb3gsIHBhcmVudFRleHRNZXRyaWNzKTsK KyAgICAgICAgLy8gV2UgbmVlZCBmbG9vci9jZWlsIHRvIG1hdGNoIGxlZ2FjeSBsYXlvdXQgaW50 ZWdyYWwgcG9zaXRpb25pbmcuCisgICAgICAgIHNldEFzY2VudEFuZERlc2NlbnQoQXNjZW50QW5k RGVzY2VudCB7IGZsb29yZihwYXJlbnRUZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2Vu dCksIGNlaWxmKHBhcmVudFRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCkgfSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKGlubGluZUxldmVsQm94LmlzTGlzdE1h cmtlcigpKSB7CisgICAgICAgIC8vIFNwZWNpYWwgbGlzdCBtYXJrZXIgaGFuZGxpbmcuIFRleHQg ZHJpdmVuIGxpc3QgbWFya2VycyBiZWhhdmUgYXMgdGV4dCB3aGVuIGl0IGNvbWVzIHRvIGxheW91 dCBib3VuZHMuCisgICAgICAgIGlmIChsaW5lQm94LmJhc2VsaW5lVHlwZSgpID09IElkZW9ncmFw aGljQmFzZWxpbmUpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcmVseSBvbiB0 aGUgaW50ZWdyYXRpb24gYmFzZWxpbmUuCisgICAgICAgICAgICBhdXRvIHBhcmVudFRleHRNZXRy aWNzID0gcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGxpbmVCb3guaW5saW5lTGV2ZWxC b3hGb3JMYXlvdXRCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkucGFyZW50KCkpLCBsaW5l Qm94LmJhc2VsaW5lVHlwZSgpKTsKKyAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhpbmxpbmVM ZXZlbEJveCwgcGFyZW50VGV4dE1ldHJpY3MpOworICAgICAgICAgICAgLy8gV2UgbmVlZCBmbG9v ci9jZWlsIHRvIG1hdGNoIGxlZ2FjeSBsYXlvdXQgaW50ZWdyYWwgcG9zaXRpb25pbmcuCisgICAg ICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KEFzY2VudEFuZERlc2NlbnQgeyBmbG9vcmYocGFy ZW50VGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5hc2NlbnQpLCBjZWlsZihwYXJlbnRUZXh0 TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmRlc2NlbnQpIH0pOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUxldmVsQm94Lmxh eW91dEJveCgpOworICAgICAgICBhdXRvJiBsaXN0TWFya2VyQm94R2VvbWV0cnkgPSBmb3JtYXR0 aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CisgICAgICAgIGF1dG8gbWFy Z2luQm94SGVpZ2h0ID0gbGlzdE1hcmtlckJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOwor ICAgICAgICBpZiAoYXV0byBhc2NlbnQgPSBkb3duY2FzdDxFbGVtZW50Qm94PihsYXlvdXRCb3gp LmJhc2VsaW5lRm9ySW50ZWdyYXRpb24oKSkgeworICAgICAgICAgICAgYXV0byB0ZXh0TWV0cmlj cyA9IFRleHRNZXRyaWNzIHsgeyAqYXNjZW50LCBtYXJnaW5Cb3hIZWlnaHQgLSAqYXNjZW50IH0s IHsgfSwgeyB9IH07CisgICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxCb3gs IHRleHRNZXRyaWNzKTsKKyAgICAgICAgICAgIC8vIFdlIG5lZWQgZmxvb3IvY2VpbCB0byBtYXRj aCBsZWdhY3kgbGF5b3V0IGludGVncmFsIHBvc2l0aW9uaW5nLgorICAgICAgICAgICAgc2V0QXNj ZW50QW5kRGVzY2VudChBc2NlbnRBbmREZXNjZW50IHsgZmxvb3JmKHRleHRNZXRyaWNzLmFzY2Vu dEFuZERlc2NlbnQuYXNjZW50KSwgY2VpbGYodGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5k ZXNjZW50KSB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBzZXRB c2NlbnRBbmREZXNjZW50KEFzY2VudEFuZERlc2NlbnQgeyBtYXJnaW5Cb3hIZWlnaHQsIHsgfSB9 KTsKKyAgICAgICAgaW5saW5lTGV2ZWxCb3guc2V0TGF5b3V0Qm91bmRzKHsgbWFyZ2luQm94SGVp Z2h0LCB7IH0gfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKGlubGluZUxldmVs Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgeworICAgICAgICBhdXRvJiBsYXlvdXRCb3gg PSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKTsKKyAgICAgICAgYXV0byYgaW5saW5lTGV2ZWxC b3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94 KTsKKyAgICAgICAgYXV0byBtYXJnaW5Cb3hIZWlnaHQgPSBpbmxpbmVMZXZlbEJveEdlb21ldHJ5 Lm1hcmdpbkJveEhlaWdodCgpOworICAgICAgICBhdXRvIGFzY2VudCA9IFsmXSgpIC0+IElubGlu ZUxheW91dFVuaXQgeworICAgICAgICAgICAgaWYgKGxheW91dFN0YXRlKCkuc2hvdWxkTm90U3lu dGhlc2l6ZUlubGluZUJsb2NrQmFzZWxpbmUoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZG93 bmNhc3Q8RWxlbWVudEJveD4obGF5b3V0Qm94KS5iYXNlbGluZUZvckludGVncmF0aW9uKCkudmFs dWVfb3IobWFyZ2luQm94SGVpZ2h0KTsKKworICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lu bGluZUJsb2NrQm94KCkpIHsKKyAgICAgICAgICAgICAgICAvLyBUaGUgYmFzZWxpbmUgb2YgYW4g J2lubGluZS1ibG9jaycgaXMgdGhlIGJhc2VsaW5lIG9mIGl0cyBsYXN0IGxpbmUgYm94IGluIHRo ZSBub3JtYWwgZmxvdywgdW5sZXNzIGl0IGhhcyBlaXRoZXIgbm8gaW4tZmxvdyBsaW5lIGJveGVz IG9yCisgICAgICAgICAgICAgICAgLy8gaWYgaXRzICdvdmVyZmxvdycgcHJvcGVydHkgaGFzIGEg Y29tcHV0ZWQgdmFsdWUgb3RoZXIgdGhhbiAndmlzaWJsZScsIGluIHdoaWNoIGNhc2UgdGhlIGJh c2VsaW5lIGlzIHRoZSBib3R0b20gbWFyZ2luIGVkZ2UuCisgICAgICAgICAgICAgICAgYXV0byBz eW50aGVzaXplQmFzZWxpbmUgPSAhbGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQoKSB8fCAhbGF5b3V0Qm94LnN0eWxlKCkuaXNPdmVyZmxvd1Zpc2libGUoKTsKKyAg ICAgICAgICAgICAgICBpZiAoc3ludGhlc2l6ZUJhc2VsaW5lKQorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gbWFyZ2luQm94SGVpZ2h0OworCisgICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0 dGluZ1N0YXRlID0gbGF5b3V0U3RhdGUoKS5mb3JtYXR0aW5nU3RhdGVGb3JJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dChkb3duY2FzdDxFbGVtZW50Qm94PihsYXlvdXRCb3gpKTsKKyAgICAgICAgICAg ICAgICBhdXRvJiBsYXN0TGluZSA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLmxhc3QoKTsKKyAg ICAgICAgICAgICAgICBhdXRvIGlubGluZUJsb2NrQmFzZWxpbmUgPSBsYXN0TGluZS50b3AoKSAr IGxhc3RMaW5lLmJhc2VsaW5lKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGlubGluZUxldmVs Qm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRl ckJlZm9yZSgpICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5wYWRkaW5nQmVmb3JlKCkudmFsdWVf b3IoMCkgKyBpbmxpbmVCbG9ja0Jhc2VsaW5lOworICAgICAgICAgICAgfQorICAgICAgICAgICAg cmV0dXJuIG1hcmdpbkJveEhlaWdodDsKKyAgICAgICAgfSgpOworICAgICAgICBzZXRBc2NlbnRB bmREZXNjZW50KEFzY2VudEFuZERlc2NlbnQgeyBhc2NlbnQsIG1hcmdpbkJveEhlaWdodCAtIGFz Y2VudCB9KTsKKyAgICAgICAgaW5saW5lTGV2ZWxCb3guc2V0TGF5b3V0Qm91bmRzKHsgYXNjZW50 LCBtYXJnaW5Cb3hIZWlnaHQgLSBhc2NlbnQgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9Cisg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0 cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZUJ1aWxkZXI6 OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCwgc2l6ZV90IGxpbmVJbmRleCkKIHsKICAgICBhdXRv JiByb290SW5saW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94KCk7Ci0gICAgc2V0TGF5b3V0 Qm91bmRzKHJvb3RJbmxpbmVCb3gsIHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChyb290 SW5saW5lQm94KSk7CisgICAgc2V0VmVydGljYWxQcm9wZXJ0aWVzRm9ySW5saW5lTGV2ZWxCb3go bGluZUJveCwgcm9vdElubGluZUJveCk7CiAKICAgICBhdXRvIHN0eWxlVG9Vc2UgPSBbJl0gKGNv bnN0IGF1dG8mIGxheW91dEJveCkgLT4gY29uc3QgUmVuZGVyU3R5bGUmIHsKICAgICAgICAgcmV0 dXJuICFsaW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5z dHlsZSgpOwpAQCAtMjc3LDQ0ICszNDMsMTcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3Ry dWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQKICAg ICAgICAgYXV0byBsb2dpY2FsTGVmdCA9IHJvb3RJbmxpbmVCb3gubG9naWNhbExlZnQoKSArIHJ1 bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICBpZiAocnVuLmlzQm94KCkpIHsKICAgICAgICAgICAg IGF1dG8mIGlubGluZUxldmVsQm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21l dHJ5Rm9yQm94KGxheW91dEJveCk7Ci0gICAgICAgICAgICBhdXRvIG1hcmdpbkJveEhlaWdodCA9 IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0KCk7Ci0gICAgICAgICAgICBh dXRvIGFzY2VudCA9IFsmXSgpIC0+IElubGluZUxheW91dFVuaXQgewotICAgICAgICAgICAgICAg IGlmIChsYXlvdXRTdGF0ZSgpLnNob3VsZE5vdFN5bnRoZXNpemVJbmxpbmVCbG9ja0Jhc2VsaW5l KCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBkb3duY2FzdDxFbGVtZW50Qm94PihsYXlv dXRCb3gpLmJhc2VsaW5lRm9ySW50ZWdyYXRpb24oKS52YWx1ZV9vcihtYXJnaW5Cb3hIZWlnaHQp OwotCi0gICAgICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkpIHsK LSAgICAgICAgICAgICAgICAgICAgLy8gVGhlIGJhc2VsaW5lIG9mIGFuICdpbmxpbmUtYmxvY2sn IGlzIHRoZSBiYXNlbGluZSBvZiBpdHMgbGFzdCBsaW5lIGJveCBpbiB0aGUgbm9ybWFsIGZsb3cs IHVubGVzcyBpdCBoYXMgZWl0aGVyIG5vIGluLWZsb3cgbGluZSBib3hlcyBvcgotICAgICAgICAg ICAgICAgICAgICAvLyBpZiBpdHMgJ292ZXJmbG93JyBwcm9wZXJ0eSBoYXMgYSBjb21wdXRlZCB2 YWx1ZSBvdGhlciB0aGFuICd2aXNpYmxlJywgaW4gd2hpY2ggY2FzZSB0aGUgYmFzZWxpbmUgaXMg dGhlIGJvdHRvbSBtYXJnaW4gZWRnZS4KLSAgICAgICAgICAgICAgICAgICAgYXV0byBzeW50aGVz aXplQmFzZWxpbmUgPSAhbGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQoKSB8fCAhc3R5bGUuaXNPdmVyZmxvd1Zpc2libGUoKTsKLSAgICAgICAgICAgICAgICAgICAg aWYgKHN5bnRoZXNpemVCYXNlbGluZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBt YXJnaW5Cb3hIZWlnaHQ7Ci0KLSAgICAgICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0 YXRlID0gbGF5b3V0U3RhdGUoKS5mb3JtYXR0aW5nU3RhdGVGb3JJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dChkb3duY2FzdDxFbGVtZW50Qm94PihsYXlvdXRCb3gpKTsKLSAgICAgICAgICAgICAgICAg ICAgYXV0byYgbGFzdExpbmUgPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5sYXN0KCk7Ci0gICAg ICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQmxvY2tCYXNlbGluZSA9IGxhc3RMaW5lLnRvcCgp ICsgbGFzdExpbmUuYmFzZWxpbmUoKTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGlubGlu ZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5 LmJvcmRlckJlZm9yZSgpICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5wYWRkaW5nQmVmb3JlKCku dmFsdWVfb3IoMCkgKyBpbmxpbmVCbG9ja0Jhc2VsaW5lOwotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgICAgICByZXR1cm4gbWFyZ2luQm94SGVpZ2h0OwotICAgICAgICAgICAgfSgpOwog ICAgICAgICAgICAgbG9naWNhbExlZnQgKz0gc3RkOjptYXgoMF9sdSwgaW5saW5lTGV2ZWxCb3hH ZW9tZXRyeS5tYXJnaW5TdGFydCgpKTsKLSAgICAgICAgICAgIGF1dG8gYXRvbWljSW5saW5lTGV2 ZWxCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3gobGF5b3V0 Qm94LCBzdHlsZSwgbG9naWNhbExlZnQsIHsgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5ib3JkZXJC b3hXaWR0aCgpLCBtYXJnaW5Cb3hIZWlnaHQgfSk7Ci0gICAgICAgICAgICBzZXRBc2NlbnRBbmRE ZXNjZW50KGF0b21pY0lubGluZUxldmVsQm94LCB7IGFzY2VudCwgbWFyZ2luQm94SGVpZ2h0IC0g YXNjZW50IH0pOwotICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2ZWxCb3guc2V0TGF5b3V0Qm91 bmRzKHsgYXNjZW50LCBtYXJnaW5Cb3hIZWlnaHQgLSBhc2NlbnQgfSk7CisgICAgICAgICAgICBh dXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lu bGluZUxldmVsQm94KGxheW91dEJveCwgc3R5bGUsIGxvZ2ljYWxMZWZ0LCB7IGlubGluZUxldmVs Qm94R2VvbWV0cnkuYm9yZGVyQm94V2lkdGgoKSwgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJn aW5Cb3hIZWlnaHQoKSB9KTsKKyAgICAgICAgICAgIHNldFZlcnRpY2FsUHJvcGVydGllc0Zvcklu bGluZUxldmVsQm94KGxpbmVCb3gsIGF0b21pY0lubGluZUxldmVsQm94KTsKICAgICAgICAgICAg IGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShhdG9taWNJbmxpbmVMZXZlbEJveCkp OwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJ1bi5pc0xp c3RNYXJrZXIoKSkgewogICAgICAgICAgICAgYXV0byYgbGlzdE1hcmtlckJveEdlb21ldHJ5ID0g Zm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOwotICAgICAgICAg ICAgYXV0byBtYXJnaW5Cb3hIZWlnaHQgPSBsaXN0TWFya2VyQm94R2VvbWV0cnkubWFyZ2luQm94 SGVpZ2h0KCk7CiAgICAgICAgICAgICBsb2dpY2FsTGVmdCArPSBzdGQ6Om1heCgwX2x1LCBsaXN0 TWFya2VyQm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSk7Ci0gICAgICAgICAgICBhdXRvIGxpc3RN YXJrZXJJbmxpbmVMZXZlbEJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVM ZXZlbEJveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgeyBsaXN0TWFya2VyQm94R2Vv bWV0cnkuYm9yZGVyQm94V2lkdGgoKSwgbWFyZ2luQm94SGVpZ2h0IH0pOwotCi0gICAgICAgICAg ICBpZiAoYXV0byBhc2NlbnQgPSBkb3duY2FzdDxFbGVtZW50Qm94PihsYXlvdXRCb3gpLmJhc2Vs aW5lRm9ySW50ZWdyYXRpb24oKSkKLSAgICAgICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMobGlz dE1hcmtlcklubGluZUxldmVsQm94LCB7IHsgKmFzY2VudCwgbWFyZ2luQm94SGVpZ2h0IC0gKmFz Y2VudCB9LCB7IH0sIHsgfSB9KTsKLSAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAg IHNldEFzY2VudEFuZERlc2NlbnQobGlzdE1hcmtlcklubGluZUxldmVsQm94LCB7IG1hcmdpbkJv eEhlaWdodCwgeyB9IH0pOwotICAgICAgICAgICAgICAgIGxpc3RNYXJrZXJJbmxpbmVMZXZlbEJv eC5zZXRMYXlvdXRCb3VuZHMoeyBtYXJnaW5Cb3hIZWlnaHQsIHsgfSB9KTsKLSAgICAgICAgICAg IH0KKyAgICAgICAgICAgIGF1dG8gbGlzdE1hcmtlcklubGluZUxldmVsQm94ID0gSW5saW5lTGV2 ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgc3R5bGUsIGxvZ2lj YWxMZWZ0LCB7IGxpc3RNYXJrZXJCb3hHZW9tZXRyeS5ib3JkZXJCb3hXaWR0aCgpLCBsaXN0TWFy a2VyQm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0KCkgfSk7CisgICAgICAgICAgICBzZXRWZXJ0 aWNhbFByb3BlcnRpZXNGb3JJbmxpbmVMZXZlbEJveChsaW5lQm94LCBsaXN0TWFya2VySW5saW5l TGV2ZWxCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3Zl KGxpc3RNYXJrZXJJbmxpbmVMZXZlbEJveCkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgIH0KQEAgLTMyNyw3ICszNjYsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJ bmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmVCdWlsZAogICAgICAg ICAgICAgYXV0byBhZGp1c3RlZExvZ2ljYWxTdGFydCA9IGxvZ2ljYWxMZWZ0ICsgc3RkOjptYXgo MC4wZiwgbWFyZ2luU3RhcnQpOwogICAgICAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSByb290 SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpIC0gYWRqdXN0ZWRMb2dpY2FsU3RhcnQ7CiAgICAgICAg ICAgICBhdXRvIGlubGluZUJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5 b3V0Qm94LCBzdHlsZSwgYWRqdXN0ZWRMb2dpY2FsU3RhcnQsIGxvZ2ljYWxXaWR0aCwgSW5saW5l TGV2ZWxCb3g6OkxpbmVTcGFubmluZ0lubGluZUJveDo6WWVzKTsKLSAgICAgICAgICAgIHNldExh eW91dEJvdW5kcyhpbmxpbmVCb3gsIHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxp bmVCb3gpKTsKKyAgICAgICAgICAgIHNldFZlcnRpY2FsUHJvcGVydGllc0ZvcklubGluZUxldmVs Qm94KGxpbmVCb3gsIGlubGluZUJveCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxl dmVsQm94KFdURk1vdmUoaW5saW5lQm94KSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQpAQCAtMzQyLDcgKzM4MSw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElu bGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZUJ1aWxkCiAgICAgICAg ICAgICBpbml0aWFsTG9naWNhbFdpZHRoID0gc3RkOjptYXgoaW5pdGlhbExvZ2ljYWxXaWR0aCwg MC5mKTsKICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0 ZUlubGluZUJveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgaW5pdGlhbExvZ2ljYWxX aWR0aCk7CiAgICAgICAgICAgICBpbmxpbmVCb3guc2V0SXNGaXJzdEJveCgpOwotICAgICAgICAg ICAgc2V0TGF5b3V0Qm91bmRzKGlubGluZUJveCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5l Qm94KGlubGluZUJveCkpOworICAgICAgICAgICAgc2V0VmVydGljYWxQcm9wZXJ0aWVzRm9ySW5s aW5lTGV2ZWxCb3gobGluZUJveCwgaW5saW5lQm94KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRk SW5saW5lTGV2ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICB9CkBAIC0zNzcsNyArNDE2LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29u c3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQK ICAgICAgICAgfQogICAgICAgICBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7CiAgICAgICAg ICAgICBhdXRvIGxpbmVCcmVha0JveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtC b3gobGF5b3V0Qm94LCBzdHlsZSwgbG9naWNhbExlZnQpOwotICAgICAgICAgICAgc2V0TGF5b3V0 Qm91bmRzKGxpbmVCcmVha0JveCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGxpbmVC b3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKSkpOworICAg ICAgICAgICAgc2V0VmVydGljYWxQcm9wZXJ0aWVzRm9ySW5saW5lTGV2ZWxCb3gobGluZUJveCwg bGluZUJyZWFrQm94KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RG TW92ZShsaW5lQnJlYWtCb3gpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CkBA IC00MjcsMTEgKzQ2Niw4IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmFkanVzdElkZW9ncmFwaGlj QmFzZWxpbmVJZkFwcGxpY2FibGUoTGluZUJveCYgbGluZUJveCwgc2l6CiAgICAgICAgIGlmICgh aW5pdGlhdGVzTGF5b3V0Qm91bmRzQ2hhbmdlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIGF1dG8gYmVoYXZlc0FzVGV4dCA9IGlubGluZUxldmVsQm94LmlzTGluZUJyZWFrQm94KCkg fHwgKGlubGluZUxldmVsQm94LmlzTGlzdE1hcmtlcigpICYmICFkb3duY2FzdDxFbGVtZW50Qm94 PihpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSkuaXNMaXN0TWFya2VySW1hZ2UoKSk7Ci0gICAg ICAgIGlmIChiZWhhdmVzQXNUZXh0KQotICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGlubGlu ZUxldmVsQm94LCBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3gobGluZUJveC5pbmxpbmVM ZXZlbEJveEZvckxheW91dEJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKS5wYXJlbnQoKSks IElkZW9ncmFwaGljQmFzZWxpbmUpKTsKLSAgICAgICAgZWxzZSBpZiAoaW5saW5lTGV2ZWxCb3gu aXNJbmxpbmVCb3goKSkKLSAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhpbmxpbmVMZXZlbEJv eCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94LCBJZGVvZ3Jh cGhpY0Jhc2VsaW5lKSk7CisgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgp IHx8IGlubGluZUxldmVsQm94LmlzTGluZUJyZWFrQm94KCkgfHwgKGlubGluZUxldmVsQm94Lmlz TGlzdE1hcmtlcigpICYmICFkb3duY2FzdDxFbGVtZW50Qm94PihpbmxpbmVMZXZlbEJveC5sYXlv dXRCb3goKSkuaXNMaXN0TWFya2VySW1hZ2UoKSkpCisgICAgICAgICAgICBzZXRWZXJ0aWNhbFBy b3BlcnRpZXNGb3JJbmxpbmVMZXZlbEJveChsaW5lQm94LCBpbmxpbmVMZXZlbEJveCk7CiAgICAg ICAgIGVsc2UgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewog ICAgICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveEhlaWdodCA9IGlubGluZUxldmVsQm94Lmxh eW91dEJvdW5kcygpLmhlaWdodCgpOwogICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpZGVv Z3JhcGhpY0Jhc2VsaW5lID0gcm91bmRUb0ludChpbmxpbmVMZXZlbEJveEhlaWdodCAvIDIpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKaW5kZXggMzgyZmI1NDgx MGY0Li5lMmEzODk2ZjNlZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1 aWxkZXIuaApAQCAtMzUsNyArMzUsNiBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIGNsYXNzIEJveDsK IGNsYXNzIEVsZW1lbnRCb3g7CiBjbGFzcyBMYXlvdXRTdGF0ZTsKLXN0cnVjdCBBc2NlbnRBbmRE ZXNjZW50Owogc3RydWN0IFRleHRNZXRyaWNzOwogCiBjbGFzcyBMaW5lQm94QnVpbGRlciB7CkBA IC00NSw4ICs0NCw4IEBAIHB1YmxpYzoKICAgICBMaW5lQm94IGJ1aWxkKGNvbnN0IExpbmVCdWls ZGVyOjpMaW5lQ29udGVudCYsIHNpemVfdCBsaW5lSW5kZXgpOwogCiBwcml2YXRlOgorICAgIHZv aWQgc2V0VmVydGljYWxQcm9wZXJ0aWVzRm9ySW5saW5lTGV2ZWxCb3goY29uc3QgTGluZUJveCYs IElubGluZUxldmVsQm94JikgY29uc3Q7CiAgICAgdm9pZCBzZXRMYXlvdXRCb3VuZHMoSW5saW5l TGV2ZWxCb3gmLCBjb25zdCBUZXh0TWV0cmljcyYpIGNvbnN0OwotICAgIHZvaWQgc2V0QXNjZW50 QW5kRGVzY2VudChJbmxpbmVMZXZlbEJveCYsIEFzY2VudEFuZERlc2NlbnQpIGNvbnN0OwogICAg IHZvaWQgYWRqdXN0TGF5b3V0Qm91bmRzV2l0aEZhbGxiYWNrRm9udHMoSW5saW5lTGV2ZWxCb3gm LCBjb25zdCBUZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCYgZmFsbGJhY2tGb250c0ZvckNvbnRl bnQsIEZvbnRCYXNlbGluZSkgY29uc3Q7CiAgICAgVGV4dFV0aWw6OkZhbGxiYWNrRm9udExpc3Qg Y29sbGVjdEZhbGxiYWNrRm9udHMoY29uc3QgSW5saW5lTGV2ZWxCb3gmIHBhcmVudElubGluZUJv eCwgY29uc3QgTGluZTo6UnVuJiwgY29uc3QgUmVuZGVyU3R5bGUmKTsKIAo= 463233 2022-10-25 12:34:11 -0700 2022-10-26 10:12:13 -0700 Patch bug-246964-20221025123410.patch text/plain 7939 zalan RnJvbSAzNTI1NmRhMGMyNWVhYTE1NDliOGIxNGI3NmFmZGMzODQ3ODE5ZjExIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMjUgT2N0IDIwMjIgMTI6MzM6MTcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbTEZDXVtJ RkNdIExpbmVCb3hCdWlsZGVyOjpzZXRMYXlvdXRCb3VuZHMgc2hvdWxkIG5vdCBjYWxsCiBzZXRB c2NlbnRBbmREZXNjZW50IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NDY5NjQKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKVGhpcyBpcyBpbiBwcmVwYXJhdGlv biBmb3Igc3VwcG9ydCBsaW5lLWJveC1jb250YWluLgooc2V0TGF5b3V0Qm91bmRzIHNob3VsZCBy ZWFsbHkganVzdCBjb21wdXRlIGFuZCBzZXQgdGhlIGxheW91dCBib3VuZHMpLgoKKiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpzZXRMYXlvdXRCb3Vu ZHMgY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjphZGp1c3RJ ZGVvZ3JhcGhpY0Jhc2VsaW5lSWZBcHBsaWNhYmxlKToKLS0tCiAuLi4vaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmNwcCAgICAgICAgICAgfCAzNyArKysrKysrKysrKystLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJveEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCmluZGV4IDYwOGNkZTJmYWExMC4u YTUwYTdhYTEwOTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxk ZXIuY3BwCkBAIC0yMjgsOCArMjI4LDYgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0TGF5b3V0 Qm91bmRzKElubGluZUxldmVsQm94JiBpbmxpbmVMZXZlbEJveCwgY29uc3QgVGV4dE0KICAgICAg ICAgaGFsZkxlYWRpbmcgPSAodGV4dE1ldHJpY3MubGluZVNwYWNpbmcgLSBsb2dpY2FsSGVpZ2h0 KSAvIDI7CiAgICAgfQogICAgIGlubGluZUxldmVsQm94LnNldExheW91dEJvdW5kcyh7IGZsb29y Zih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCArIGhhbGZMZWFkaW5nKSwgY2Vp bGYodGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5kZXNjZW50ICsgaGFsZkxlYWRpbmcpIH0p OwotICAgIC8vIFdlIG5lZWQgZmxvb3IvY2VpbCB0byBtYXRjaCBsZWdhY3kgbGF5b3V0IGludGVn cmFsIHBvc2l0aW9uaW5nLgotICAgIHNldEFzY2VudEFuZERlc2NlbnQoaW5saW5lTGV2ZWxCb3gs IHsgZmxvb3JmKHRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuYXNjZW50KSwgY2VpbGYodGV4 dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5kZXNjZW50KSB9KTsKIH0KIAogdm9pZCBMaW5lQm94 QnVpbGRlcjo6c2V0QXNjZW50QW5kRGVzY2VudChJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxC b3gsIEFzY2VudEFuZERlc2NlbnQgYXNjZW50QW5kRGVzY2VudCkgY29uc3QKQEAgLTI0Miw3ICsy NDAsOSBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpzZXRBc2NlbnRBbmREZXNjZW50KElubGluZUxl dmVsQm94JiBpbmxpbmVMZXZlbEJveCwgQXNjZW50QQogdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29u c3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGRl cjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBzaXplX3QgbGluZUluZGV4KQogewogICAgIGF1 dG8mIHJvb3RJbmxpbmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKLSAgICBzZXRMYXlv dXRCb3VuZHMocm9vdElubGluZUJveCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KHJv b3RJbmxpbmVCb3gpKTsKKyAgICBhdXRvIHJvb3RJbmxpbmVCb3hUZXh0TWV0cmljcyA9IHByaW1h cnlGb250TWV0cmljc0ZvcklubGluZUJveChyb290SW5saW5lQm94KTsKKyAgICBzZXRMYXlvdXRC b3VuZHMocm9vdElubGluZUJveCwgcm9vdElubGluZUJveFRleHRNZXRyaWNzKTsKKyAgICBzZXRB c2NlbnRBbmREZXNjZW50KHJvb3RJbmxpbmVCb3gsIHsgZmxvb3JmKHJvb3RJbmxpbmVCb3hUZXh0 TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCksIGNlaWxmKHJvb3RJbmxpbmVCb3hUZXh0 TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmRlc2NlbnQpIH0pOwogCiAgICAgYXV0byBzdHlsZVRv VXNlID0gWyZdIChjb25zdCBhdXRvJiBsYXlvdXRCb3gpIC0+IGNvbnN0IFJlbmRlclN0eWxlJiB7 CiAgICAgICAgIHJldHVybiAhbGluZUluZGV4ID8gbGF5b3V0Qm94LmZpcnN0TGluZVN0eWxlKCkg OiBsYXlvdXRCb3guc3R5bGUoKTsKQEAgLTMwOSw5ICszMDksMTAgQEAgdm9pZCBMaW5lQm94QnVp bGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBM aW5lQnVpbGQKICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0ICs9IHN0ZDo6bWF4KDBfbHUsIGxpc3RN YXJrZXJCb3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpKTsKICAgICAgICAgICAgIGF1dG8gbGlzdE1h cmtlcklubGluZUxldmVsQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxl dmVsQm94KGxheW91dEJveCwgc3R5bGUsIGxvZ2ljYWxMZWZ0LCB7IGxpc3RNYXJrZXJCb3hHZW9t ZXRyeS5ib3JkZXJCb3hXaWR0aCgpLCBtYXJnaW5Cb3hIZWlnaHQgfSk7CiAKLSAgICAgICAgICAg IGlmIChhdXRvIGFzY2VudCA9IGRvd25jYXN0PEVsZW1lbnRCb3g+KGxheW91dEJveCkuYmFzZWxp bmVGb3JJbnRlZ3JhdGlvbigpKQorICAgICAgICAgICAgaWYgKGF1dG8gYXNjZW50ID0gZG93bmNh c3Q8RWxlbWVudEJveD4obGF5b3V0Qm94KS5iYXNlbGluZUZvckludGVncmF0aW9uKCkpIHsKICAg ICAgICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMobGlzdE1hcmtlcklubGluZUxldmVsQm94LCB7 IHsgKmFzY2VudCwgbWFyZ2luQm94SGVpZ2h0IC0gKmFzY2VudCB9LCB7IH0sIHsgfSB9KTsKLSAg ICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgIHNldEFzY2VudEFuZERlc2NlbnQobGlz dE1hcmtlcklubGluZUxldmVsQm94LCB7IGZsb29yZigqYXNjZW50KSwgY2VpbGYobWFyZ2luQm94 SGVpZ2h0IC0gKmFzY2VudCkgfSk7CisgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAg ICAgIHNldEFzY2VudEFuZERlc2NlbnQobGlzdE1hcmtlcklubGluZUxldmVsQm94LCB7IG1hcmdp bkJveEhlaWdodCwgeyB9IH0pOwogICAgICAgICAgICAgICAgIGxpc3RNYXJrZXJJbmxpbmVMZXZl bEJveC5zZXRMYXlvdXRCb3VuZHMoeyBtYXJnaW5Cb3hIZWlnaHQsIHsgfSB9KTsKICAgICAgICAg ICAgIH0KQEAgLTMyNyw3ICszMjgsOSBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJ bmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmVCdWlsZAogICAgICAg ICAgICAgYXV0byBhZGp1c3RlZExvZ2ljYWxTdGFydCA9IGxvZ2ljYWxMZWZ0ICsgc3RkOjptYXgo MC4wZiwgbWFyZ2luU3RhcnQpOwogICAgICAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSByb290 SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpIC0gYWRqdXN0ZWRMb2dpY2FsU3RhcnQ7CiAgICAgICAg ICAgICBhdXRvIGlubGluZUJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5 b3V0Qm94LCBzdHlsZSwgYWRqdXN0ZWRMb2dpY2FsU3RhcnQsIGxvZ2ljYWxXaWR0aCwgSW5saW5l TGV2ZWxCb3g6OkxpbmVTcGFubmluZ0lubGluZUJveDo6WWVzKTsKLSAgICAgICAgICAgIHNldExh eW91dEJvdW5kcyhpbmxpbmVCb3gsIHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxp bmVCb3gpKTsKKyAgICAgICAgICAgIGF1dG8gdGV4dE1ldHJpY3MgPSBwcmltYXJ5Rm9udE1ldHJp Y3NGb3JJbmxpbmVCb3goaW5saW5lQm94KTsKKyAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhp bmxpbmVCb3gsIHRleHRNZXRyaWNzKTsKKyAgICAgICAgICAgIHNldEFzY2VudEFuZERlc2NlbnQo aW5saW5lQm94LCB7IGZsb29yZih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmFzY2VudCks IGNlaWxmKHRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCkgfSk7CiAgICAgICAg ICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94KSk7CiAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtMzQyLDcgKzM0NSw5IEBAIHZvaWQgTGlu ZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwg Y29uc3QgTGluZUJ1aWxkCiAgICAgICAgICAgICBpbml0aWFsTG9naWNhbFdpZHRoID0gc3RkOjpt YXgoaW5pdGlhbExvZ2ljYWxXaWR0aCwgMC5mKTsKICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94 ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dp Y2FsTGVmdCwgaW5pdGlhbExvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAgICBpbmxpbmVCb3guc2V0 SXNGaXJzdEJveCgpOwotICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGlubGluZUJveCwgcHJp bWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUJveCkpOworICAgICAgICAgICAgYXV0 byB0ZXh0TWV0cmljcyA9IHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChpbmxpbmVCb3gp OworICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGlubGluZUJveCwgdGV4dE1ldHJpY3MpOwor ICAgICAgICAgICAgc2V0QXNjZW50QW5kRGVzY2VudChpbmxpbmVCb3gsIHsgZmxvb3JmKHRleHRN ZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuYXNjZW50KSwgY2VpbGYodGV4dE1ldHJpY3MuYXNjZW50 QW5kRGVzY2VudC5kZXNjZW50KSB9KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2 ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICB9CkBAIC0zNzcsNyArMzgyLDkgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQKICAgICAgICAg fQogICAgICAgICBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7CiAgICAgICAgICAgICBhdXRv IGxpbmVCcmVha0JveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3gobGF5b3V0 Qm94LCBzdHlsZSwgbG9naWNhbExlZnQpOwotICAgICAgICAgICAgc2V0TGF5b3V0Qm91bmRzKGxp bmVCcmVha0JveCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGxpbmVCb3guaW5saW5l TGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKSkpOworICAgICAgICAgICAg YXV0byB0ZXh0TWV0cmljcyA9IHByaW1hcnlGb250TWV0cmljc0ZvcklubGluZUJveChsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveC5wYXJlbnQoKSkpOworICAgICAg ICAgICAgc2V0TGF5b3V0Qm91bmRzKGxpbmVCcmVha0JveCwgdGV4dE1ldHJpY3MpOworICAgICAg ICAgICAgc2V0QXNjZW50QW5kRGVzY2VudChsaW5lQnJlYWtCb3gsIHsgZmxvb3JmKHRleHRNZXRy aWNzLmFzY2VudEFuZERlc2NlbnQuYXNjZW50KSwgY2VpbGYodGV4dE1ldHJpY3MuYXNjZW50QW5k RGVzY2VudC5kZXNjZW50KSB9KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxC b3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICB9CkBAIC00MjgsMTEgKzQzNSwxNSBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjphZGp1c3RJZGVv Z3JhcGhpY0Jhc2VsaW5lSWZBcHBsaWNhYmxlKExpbmVCb3gmIGxpbmVCb3gsIHNpegogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIGF1dG8gYmVoYXZlc0FzVGV4dCA9IGlubGluZUxldmVs Qm94LmlzTGluZUJyZWFrQm94KCkgfHwgKGlubGluZUxldmVsQm94LmlzTGlzdE1hcmtlcigpICYm ICFkb3duY2FzdDxFbGVtZW50Qm94PihpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSkuaXNMaXN0 TWFya2VySW1hZ2UoKSk7Ci0gICAgICAgIGlmIChiZWhhdmVzQXNUZXh0KQotICAgICAgICAgICAg c2V0TGF5b3V0Qm91bmRzKGlubGluZUxldmVsQm94LCBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxp bmVCb3gobGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxpbmVMZXZlbEJveC5s YXlvdXRCb3goKS5wYXJlbnQoKSksIElkZW9ncmFwaGljQmFzZWxpbmUpKTsKLSAgICAgICAgZWxz ZSBpZiAoaW5saW5lTGV2ZWxCb3guaXNJbmxpbmVCb3goKSkKLSAgICAgICAgICAgIHNldExheW91 dEJvdW5kcyhpbmxpbmVMZXZlbEJveCwgcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGlu bGluZUxldmVsQm94LCBJZGVvZ3JhcGhpY0Jhc2VsaW5lKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlu bGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgeworICAgICAgICBpZiAoYmVo YXZlc0FzVGV4dCkgeworICAgICAgICAgICAgYXV0byB0ZXh0TWV0cmljcyA9IHByaW1hcnlGb250 TWV0cmljc0ZvcklubGluZUJveChsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGlu bGluZUxldmVsQm94LmxheW91dEJveCgpLnBhcmVudCgpKSwgSWRlb2dyYXBoaWNCYXNlbGluZSk7 CisgICAgICAgICAgICBzZXRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxCb3gsIHRleHRNZXRyaWNz KTsKKyAgICAgICAgICAgIHNldEFzY2VudEFuZERlc2NlbnQoaW5saW5lTGV2ZWxCb3gsIHsgZmxv b3JmKHRleHRNZXRyaWNzLmFzY2VudEFuZERlc2NlbnQuYXNjZW50KSwgY2VpbGYodGV4dE1ldHJp Y3MuYXNjZW50QW5kRGVzY2VudC5kZXNjZW50KSB9KTsKKyAgICAgICAgfSBlbHNlIGlmIChpbmxp bmVMZXZlbEJveC5pc0lubGluZUJveCgpKSB7CisgICAgICAgICAgICBhdXRvIHRleHRNZXRyaWNz ID0gcHJpbWFyeUZvbnRNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94LCBJZGVvZ3Jh cGhpY0Jhc2VsaW5lKTsKKyAgICAgICAgICAgIHNldExheW91dEJvdW5kcyhpbmxpbmVMZXZlbEJv eCwgdGV4dE1ldHJpY3MpOworICAgICAgICAgICAgc2V0QXNjZW50QW5kRGVzY2VudChpbmxpbmVM ZXZlbEJveCwgeyBmbG9vcmYodGV4dE1ldHJpY3MuYXNjZW50QW5kRGVzY2VudC5hc2NlbnQpLCBj ZWlsZih0ZXh0TWV0cmljcy5hc2NlbnRBbmREZXNjZW50LmRlc2NlbnQpIH0pOworICAgICAgICB9 IGVsc2UgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewogICAg ICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveEhlaWdodCA9IGlubGluZUxldmVsQm94LmxheW91 dEJvdW5kcygpLmhlaWdodCgpOwogICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpZGVvZ3Jh cGhpY0Jhc2VsaW5lID0gcm91bmRUb0ludChpbmxpbmVMZXZlbEJveEhlaWdodCAvIDIpOwogICAg ICAgICAgICAgLy8gTW92ZSB0aGUgYmFzZWxpbmUgcG9zaXRpb24gYnV0IGtlZXAgdGhlIHNhbWUg bG9naWNhbCBoZWlnaHQuCg==