233950 2021-12-07 13:08:03 -0800 [LFC][IFC] Make collectInkOverflowForInlineBoxes propagate ink overflow using the display box list 2021-12-09 13:05: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 1821194 0 zalan 2021-12-07 13:08:03 -0800 ssia 1821201 1 446229 zalan 2021-12-07 13:14:12 -0800 Created attachment 446229 Patch 1821340 2 446278 zalan 2021-12-07 18:57:19 -0800 Created attachment 446278 Patch 1822154 3 ews-feeder 2021-12-09 09:11:31 -0800 Committed r286782 (245023@main): <https://commits.webkit.org/245023@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446278. 1822278 4 webkit-bug-importer 2021-12-09 13:05:29 -0800 <rdar://problem/86287054> 446229 2021-12-07 13:14:12 -0800 2021-12-07 18:57:17 -0800 Patch bug-233950-20211207131411.patch text/plain 12601 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IwMjMyZGYwNzNhZDc3 YTI2ODEwYWZmN2YzOWQ0NGQwOTQxOTUzYy4uMGU2NDM1MTE4YjIxMDM0ZjI0NGQ3MDNjNmFhNGE1 NDUwZmNjMDAyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEyLTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1ha2UgY29s bGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMgcHJvcGFnYXRlIGluayBvdmVyZmxvdyB1c2lu ZyB0aGUgZGlzcGxheSBib3ggbGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjMzOTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3Igc3VwcG9ydGluZyBpbmsg b3ZlcmZsb3cgYWNyb3NzIGJpZGkgYm91bmRhcmllcy4KKworICAgICAgICBUaGUgY3VycmVudCBI YXNoTWFwPGNvbnN0IEJveCosIHNpemVfdD4gYXBwcm9hY2ggZG9lcyBub3Qgd29yayB3aGVuIGEg bGF5b3V0IGJveCBjb3VsZAorICAgICAgICBwcm9kdWNlIG11bHRpcGxlIGlubGluZSBib3ggdHlw ZSBvZiBkaXNwbGF5IGJveGVzIG9uIHRoZSBzYW1lIGxpbmUgKGF0IGJpZGkgYm91bmRhcmllcyku CisgICAgICAgIEluc3RlYWQgbGV0J3MgcHJvcGFnYXRlIGluayBvdmVyZmxvdyBieSB0cmF2ZXJz aW5nIHRoZSBkaXNwbGF5IGJveCBsaXN0IHN0YXJ0aW5nCisgICAgICAgIGF0IHRoZSBlbmQgYW5k IGJ1YmJsZSB1cCB0aGUgaW5mbGF0ZWQgaW5rIG92ZXJmbG93IHJlY3QgdG8gdGhlIHBhcmVudCBp bmxpbmUgYm94ZXMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Y29tcHV0ZUJveFNoYWRvd0lua092ZXJmbG93KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRBdG9taWNJbmxp bmVMZXZlbERpc3BsYXlCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlCb3gpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFNwYW5u aW5nSW5saW5lQm94RGlzcGxheUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjphZGRCb3hTaGFkb3dJbmtPdmVyZmxvdyk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6CisKIDIwMjEtMTItMDYgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVXNlIHRoZSBvYmplY3RSZXBsYWNl bWVudENoYXJhY3RlciAob3RoZXIpIG5ldXRyYWwgY2hhcmFjdGVyIHRvIGluZGljYXRlIElubGlu ZUJveFN0YXJ0L0VuZCBpbmxpbmUgaXRlbXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IDdhYjdjOWU4ZDVhNDUxOWQyMGE1 Mjg0ZTBjODgwOTNiNjQxMjMxNjUuLjBiMWU5ZjJkNGIzZDQzMWU2MWViYzJlOTM3YWVlN2YwMzNi M2I4YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcApAQCAtNzQsMTEgKzc0LDExIEBAIERpc3BsYXlCb3hlcyBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYK ICAgICBlbHNlCiAgICAgICAgIHByb2Nlc3NOb25CaWRpQ29udGVudChsaW5lQ29udGVudCwgbGlu ZUJveCwgbGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSwgYm94ZXMpOwogICAgIHByb2Nlc3NP dmVyZmxvd25SdW5zRm9yRWxsaXBzaXMoYm94ZXMsIGxpbmVCb3hMb2dpY2FsUmVjdC5yaWdodCgp KTsKLSAgICBjb2xsZWN0SW5rT3ZlcmZsb3dGb3JJbmxpbmVCb3hlcyhsaW5lQm94LCBib3hlcyk7 CisgICAgY29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMoYm94ZXMpOwogICAgIHJldHVy biBib3hlczsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGFkZEJveFNoYWRvd0lua092ZXJmbG93 KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lUmVjdCYgaW5rT3ZlcmZsb3cpCitzdGF0 aWMgaW5saW5lIGJvb2wgY29tcHV0ZUJveFNoYWRvd0lua092ZXJmbG93KGNvbnN0IFJlbmRlclN0 eWxlJiBzdHlsZSwgSW5saW5lUmVjdCYgaW5rT3ZlcmZsb3cpCiB7CiAgICAgYXV0byB0b3BCb3hT aGFkb3cgPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIGJvdHRvbUJveFNoYWRvdyA9IExheW91 dFVuaXQgeyB9OwpAQCAtODcsNyArODcsMTAgQEAgc3RhdGljIGlubGluZSB2b2lkIGFkZEJveFNo YWRvd0lua092ZXJmbG93KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lUmVjdCYKICAg ICBhdXRvIGxlZnRCb3hTaGFkb3cgPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIHJpZ2h0Qm94 U2hhZG93ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgc3R5bGUuZ2V0Qm94U2hhZG93SW5saW5lRGly ZWN0aW9uRXh0ZW50KGxlZnRCb3hTaGFkb3csIHJpZ2h0Qm94U2hhZG93KTsKKyAgICBpZiAoIXRv cEJveFNoYWRvdyAmJiAhYm90dG9tQm94U2hhZG93ICYmICFsZWZ0Qm94U2hhZG93ICYmICFyaWdo dEJveFNoYWRvdykKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlua092ZXJmbG93LmluZmxh dGUoSW5saW5lTGF5b3V0VW5pdCB7IHRvcEJveFNoYWRvdyB9LCBJbmxpbmVMYXlvdXRVbml0IHsg cmlnaHRCb3hTaGFkb3cgfSwgSW5saW5lTGF5b3V0VW5pdCB7IGJvdHRvbUJveFNoYWRvdyB9LCBJ bmxpbmVMYXlvdXRVbml0IHsgbGVmdEJveFNoYWRvdyB9KTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0K IAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFRleHREaXNwbGF5Qm94 KGNvbnN0IExpbmU6OlJ1biYgbGluZVJ1biwgY29uc3QgSW5saW5lUmVjdCYgdGV4dFJ1blJlY3Qs IERpc3BsYXlCb3hlcyYgYm94ZXMpCkBAIC0xNjgsMzQgKzE3MSwyMiBAQCB2b2lkIElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kQXRvbWljSW5saW5lTGV2ZWxEaXNwbGF5Qm94KGNv bnN0IExpbmU6OgogICAgIEFTU0VSVChsaW5lUnVuLmxheW91dEJveCgpLmlzQXRvbWljSW5saW5l TGV2ZWxCb3goKSk7CiAKICAgICBhdXRvJiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgp OwotICAgIC8vIEZJWE1FOiBBZGQgaW5rIG92ZXJmbG93IHN1cHBvcnQgZm9yIGF0b21pYyBpbmxp bmUgbGV2ZWwgYm94ZXMgKGUuZy4gYm94IHNoYWRvdykuCisgICAgYXV0byBpbmtPdmVyZmxvdyA9 IFsmXSB7CisgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBib3JkZXJCb3hSZWN0OworICAgICAg ICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNvbXB1dGVCb3hTaGFkb3dJbmtPdmVyZmxvdygh bV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHls ZSgpLCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3c7CisgICAgICAgIHJl dHVybiBpbmtPdmVyZmxvdzsKKyAgICB9OwogICAgIGJveGVzLmFwcGVuZCh7IG1fbGluZUluZGV4 CiAgICAgICAgICwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJv eAogICAgICAgICAsIGxheW91dEJveAogICAgICAgICAsIGxpbmVSdW4uYmlkaUxldmVsKCkKICAg ICAgICAgLCBib3JkZXJCb3hSZWN0Ci0gICAgICAgICwgYm9yZGVyQm94UmVjdAorICAgICAgICAs IGlua092ZXJmbG93KCkKICAgICAgICAgLCBsaW5lUnVuLmV4cGFuc2lvbigpCiAgICAgICAgICwg eyB9IH0pOwotCiAgICAgLy8gTm90ZSB0aGF0IGlubGluZSBib3hlcyBhcmUgcmVsYXRpdmUgdG8g dGhlIGxpbmUgYW5kIHRoZWlyIHRvcCBwb3NpdGlvbiBjYW4gYmUgbmVnYXRpdmUuCiAgICAgLy8g QXRvbWljIGlubGluZSBib3hlcyBhcmUgYWxsIHNldC4gVGhlaXIgbWFyZ2luL2JvcmRlci9jb250 ZW50IGJveCBnZW9tZXRyaWVzIGFyZSBhbHJlYWR5IGNvbXB1dGVkLiBXZSBqdXN0IGhhdmUgdG8g cG9zaXRpb24gdGhlbSBoZXJlLgotICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0 YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKLSAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2Fs VG9wTGVmdCh0b0xheW91dFBvaW50KGJvcmRlckJveFJlY3QudG9wTGVmdCgpKSk7Ci0KLSAgICBh dXRvIGFkanVzdFBhcmVudElubGluZUJveElua092ZXJmbG93ID0gWyZdIHsKLSAgICAgICAgYXV0 byYgcGFyZW50SW5saW5lQm94ID0gbGF5b3V0Qm94LnBhcmVudCgpOwotICAgICAgICBpZiAoJnBh cmVudElubGluZUJveCA9PSAmcm9vdCgpKSB7Ci0gICAgICAgICAgICAvLyBXZSBkb24ndCBjb2xs ZWN0IGluayBvdmVyZmxvdyBmb3IgdGhlIHJvb3QgaW5saW5lIGJveC4KLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQotICAgICAgICBSRUxFQVNFX0FTU0VSVChtX2lubGluZUJveEluZGV4 TWFwLmNvbnRhaW5zKCZwYXJlbnRJbmxpbmVCb3gpKTsKLQotICAgICAgICBhdXRvIGJveElua092 ZXJmbG93ID0gYm9yZGVyQm94UmVjdDsKLSAgICAgICAgYWRkQm94U2hhZG93SW5rT3ZlcmZsb3co IW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZpcnN0TGluZVN0eWxlKCkgOiBsYXlvdXRCb3guc3R5 bGUoKSwgYm94SW5rT3ZlcmZsb3cpOwotICAgICAgICBib3hlc1ttX2lubGluZUJveEluZGV4TWFw LmdldCgmcGFyZW50SW5saW5lQm94KV0uYWRqdXN0SW5rT3ZlcmZsb3coYm94SW5rT3ZlcmZsb3cp OwotICAgIH07Ci0gICAgYWRqdXN0UGFyZW50SW5saW5lQm94SW5rT3ZlcmZsb3coKTsKKyAgICBm b3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpLnNldExvZ2ljYWxUb3BMZWZ0 KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94UmVjdC50b3BMZWZ0KCkpKTsKIH0KIAogdm9pZCBJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnNldElubGluZUJveEdlb21ldHJ5KGNvbnN0IEJveCYg bGF5b3V0Qm94LCBjb25zdCBJbmxpbmVSZWN0JiByZWN0LCBib29sIGlzRmlyc3RJbmxpbmVCb3hG cmFnbWVudCkKQEAgLTIyMCwyOSArMjExLDMwIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjphcHBlbmRJbmxpbmVCb3hEaXNwbGF5Qm94KGNvbnN0IExpbmU6OlJ1biYgbGluCiAg ICAgQVNTRVJUKGxpbmVSdW4ubGF5b3V0Qm94KCkuaXNJbmxpbmVCb3goKSk7CiAKICAgICBhdXRv JiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOwotICAgIGlmIChsaW5laGFzQ29udGVu dCkgewotICAgICAgICBhdXRvIGlua092ZXJmbG93ID0gWyZdIHsKLSAgICAgICAgICAgIGF1dG8g aW5rT3ZlcmZsb3cgPSBpbmxpbmVCb3hCb3JkZXJCb3g7Ci0gICAgICAgICAgICBhZGRCb3hTaGFk b3dJbmtPdmVyZmxvdyghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6 IGxheW91dEJveC5zdHlsZSgpLCBpbmtPdmVyZmxvdyk7Ci0gICAgICAgICAgICByZXR1cm4gaW5r T3ZlcmZsb3c7Ci0gICAgICAgIH07CisKKyAgICBpZiAoIWxpbmVoYXNDb250ZW50KSB7CiAgICAg ICAgIC8vIEZJWE1FOiBJdCdzIGV4cGVjdGVkIHRvIG5vdCBoYXZlIGFueSBib3hlcyBvbiBlbXB0 eSBsaW5lcy4gV2Ugc2hvdWxkIHJlY29uc2lkZXIgdGhpcy4KLSAgICAgICAgbV9pbmxpbmVCb3hJ bmRleE1hcC5hZGQoJmxheW91dEJveCwgYm94ZXMuc2l6ZSgpKTsKLQotICAgICAgICBBU1NFUlQo aW5saW5lQm94LmlzSW5saW5lQm94KCkpOwotICAgICAgICBBU1NFUlQoaW5saW5lQm94LmlzRmly c3RCb3goKSk7Ci0gICAgICAgIGJveGVzLmFwcGVuZCh7IG1fbGluZUluZGV4Ci0gICAgICAgICAg ICAsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6Tm9uUm9vdElubGluZUJveAotICAgICAgICAg ICAgLCBsYXlvdXRCb3gKLSAgICAgICAgICAgICwgbGluZVJ1bi5iaWRpTGV2ZWwoKQotICAgICAg ICAgICAgLCBpbmxpbmVCb3hCb3JkZXJCb3gKLSAgICAgICAgICAgICwgaW5rT3ZlcmZsb3coKQot ICAgICAgICAgICAgLCB7IH0KLSAgICAgICAgICAgICwgeyB9Ci0gICAgICAgICAgICAsIGlubGlu ZUJveC5oYXNDb250ZW50KCkKLSAgICAgICAgICAgICwgaXNGaXJzdExhc3RCb3goaW5saW5lQm94 KSB9KTsKKyAgICAgICAgc2V0SW5saW5lQm94R2VvbWV0cnkobGF5b3V0Qm94LCBpbmxpbmVCb3hC b3JkZXJCb3gsIHRydWUpOworICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgYXV0byBpbmtP dmVyZmxvdyA9IFsmXSB7CisgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBpbmxpbmVCb3hCb3Jk ZXJCb3g7CisgICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gY29tcHV0ZUJveFNoYWRv d0lua092ZXJmbG93KCFtX2xpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHlsZSgpIDog bGF5b3V0Qm94LnN0eWxlKCksIGlua092ZXJmbG93KSB8fCBtX2NvbnRlbnRIYXNJbmtPdmVyZmxv dzsKKyAgICAgICAgcmV0dXJuIGlua092ZXJmbG93OworICAgIH07CisgICAgQVNTRVJUKGlubGlu ZUJveC5pc0lubGluZUJveCgpKTsKKyAgICBBU1NFUlQoaW5saW5lQm94LmlzRmlyc3RCb3goKSk7 CisgICAgYm94ZXMuYXBwZW5kKHsgbV9saW5lSW5kZXgKKyAgICAgICAgLCBJbmxpbmVEaXNwbGF5 OjpCb3g6OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gKKyAgICAgICAgLCBsYXlvdXRCb3gKKyAgICAg ICAgLCBsaW5lUnVuLmJpZGlMZXZlbCgpCisgICAgICAgICwgaW5saW5lQm94Qm9yZGVyQm94Cisg ICAgICAgICwgaW5rT3ZlcmZsb3coKQorICAgICAgICAsIHsgfQorICAgICAgICAsIHsgfQorICAg ICAgICAsIGlubGluZUJveC5oYXNDb250ZW50KCkKKyAgICAgICAgLCBpc0ZpcnN0TGFzdEJveChp bmxpbmVCb3gpIH0pOwogICAgIC8vIFRoaXMgaW5saW5lIGJveCBzaG93ZWQgdXAgZmlyc3Qgb24g dGhpcyBsaW5lLgogICAgIHNldElubGluZUJveEdlb21ldHJ5KGxheW91dEJveCwgaW5saW5lQm94 Qm9yZGVyQm94LCB0cnVlKTsKIH0KQEAgLTI1MiwxMSArMjQ0LDkgQEAgdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFNwYW5uaW5nSW5saW5lQm94RGlzcGxheUJveChjb25z dCBMaW5lOjoKICAgICBBU1NFUlQobGluZVJ1bi5sYXlvdXRCb3goKS5pc0lubGluZUJveCgpKTsK IAogICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7Ci0gICAgbV9pbmxp bmVCb3hJbmRleE1hcC5hZGQoJmxheW91dEJveCwgYm94ZXMuc2l6ZSgpKTsKLQogICAgIGF1dG8g aW5rT3ZlcmZsb3cgPSBbJl0gewogICAgICAgICBhdXRvIGlua092ZXJmbG93ID0gaW5saW5lQm94 Qm9yZGVyQm94OwotICAgICAgICBhZGRCb3hTaGFkb3dJbmtPdmVyZmxvdyghbV9saW5lSW5kZXgg PyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgpLCBpbmtPdmVy Zmxvdyk7CisgICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gY29tcHV0ZUJveFNoYWRv d0lua092ZXJmbG93KCFtX2xpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHlsZSgpIDog bGF5b3V0Qm94LnN0eWxlKCksIGlua092ZXJmbG93KSB8fCBtX2NvbnRlbnRIYXNJbmtPdmVyZmxv dzsKICAgICAgICAgcmV0dXJuIGlua092ZXJmbG93OwogICAgIH07CiAgICAgQVNTRVJUKCFpbmxp bmVCb3guaXNGaXJzdEJveCgpKTsKQEAgLTI3MCw3ICsyNjAsNiBAQCB2b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6YXBwZW5kU3Bhbm5pbmdJbmxpbmVCb3hEaXNwbGF5Qm94KGNvbnN0 IExpbmU6OgogICAgICAgICAsIHsgfQogICAgICAgICAsIGlubGluZUJveC5oYXNDb250ZW50KCkK ICAgICAgICAgLCBpc0ZpcnN0TGFzdEJveChpbmxpbmVCb3gpIH0pOwotCiAgICAgLy8gTWlkZGxl IG9yIGVuZCBvZiB0aGUgaW5saW5lIGJveC4gTGV0J3Mgc3RyZXRjaCB0aGUgYm94IGFzIG5lZWRl ZC4KICAgICBzZXRJbmxpbmVCb3hHZW9tZXRyeShsYXlvdXRCb3gsIGlubGluZUJveEJvcmRlckJv eCwgZmFsc2UpOwogfQpAQCAtNjA4LDI3ICs1OTcsMzAgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NPdmVyZmxvd25SdW5zRm9yRWxsaXBzaXMoRGlzcGxheUJveGVz JgogICAgICAgICAsIElubGluZURpc3BsYXk6OkJveDo6VGV4dCB7IDAsIDEsIGVsbGlwc2lzU3Ry LT5zdHJpbmcoKSB9IH0pOwogfQogCi12b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 Y29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMoY29uc3QgTGluZUJveCYgbGluZUJveCwg RGlzcGxheUJveGVzJiBib3hlcykKK3ZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpj b2xsZWN0SW5rT3ZlcmZsb3dGb3JJbmxpbmVCb3hlcyhEaXNwbGF5Qm94ZXMmIGJveGVzKQogewot ICAgIGlmIChtX2lubGluZUJveEluZGV4TWFwLmlzRW1wdHkoKSB8fCAhbGluZUJveC5oYXNDb250 ZW50KCkpIHsKLSAgICAgICAgLy8gVGhpcyBsaW5lIGhhcyBubyBpbmxpbmUgYm94IChvbmx5IHJv b3QsIGJ1dCB3ZSBkb24ndCBjb2xsZWN0IGluayBvdmVyZmxvdyBmb3IgdGhlIHJvb3QgaW5saW5l IGJveCBhdG0pCisgICAgaWYgKCFtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdykKICAgICAgICAgcmV0 dXJuOwotICAgIH0KLQotICAgIGF1dG8mIG5vblJvb3RJbmxpbmVMZXZlbEJveGVzID0gbGluZUJv eC5ub25Sb290SW5saW5lTGV2ZWxCb3hlcygpOwogICAgIC8vIFZpc2l0IHRoZSBpbmxpbmUgYm94 ZXMgYW5kIHByb3BhZ2F0ZSBpbmsgb3ZlcmZsb3cgdG8gdGhlaXIgcGFyZW50cyAtZXhjZXB0IHRv IHRoZSByb290IGlubGluZSBib3guCiAgICAgLy8gKGUuZy4gPHNwYW4gc3R5bGU9ImZvbnQtc2l6 ZTogMTBweDsiPlNtYWxsIGZvbnQgc2l6ZTxzcGFuIHN0eWxlPSJmb250LXNpemU6IDMwMHB4OyI+ TGFyZ2VyIGZvbnQgc2l6ZS4gVGhpcyBvdmVyZmxvd3MgdGhlIHRvcCBtb3N0IHNwYW4uPC9zcGFu Pjwvc3Bhbj4pLgotICAgIGZvciAoc2l6ZV90IGluZGV4ID0gbm9uUm9vdElubGluZUxldmVsQm94 ZXMuc2l6ZSgpOyBpbmRleC0tOykgewotICAgICAgICBpZiAoIW5vblJvb3RJbmxpbmVMZXZlbEJv eGVzW2luZGV4XS5pc0lubGluZUJveCgpKQorICAgIGF1dG8gYWNjdW11bGF0ZWRJbmtPdmVyZmxv d1JlY3QgPSBJbmxpbmVSZWN0IHsgeyB9LCB7IH0gfTsKKyAgICBmb3IgKHNpemVfdCBpbmRleCA9 IGJveGVzLnNpemUoKTsgaW5kZXgtLTspIHsKKyAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGJv eGVzW2luZGV4XTsKKworICAgICAgICBhdXRvIG1heUhhdmVJbmtPdmVyZmxvdyA9IGRpc3BsYXlC b3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpIHx8IGRpc3BsYXlCb3guaXNHZW5lcmljSW5saW5l TGV2ZWxCb3goKSB8fCBkaXNwbGF5Qm94LmlzTm9uUm9vdElubGluZUJveCgpOworICAgICAgICBp ZiAoIW1heUhhdmVJbmtPdmVyZmxvdykKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBh dXRvJiBpbmxpbmVCb3ggPSBub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF0ubGF5b3V0Qm94 KCk7Ci0gICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGlubGluZUJveC5wYXJlbnQoKTsK LSAgICAgICAgaWYgKCZwYXJlbnRJbmxpbmVCb3ggPT0gJnJvb3QoKSkKKworICAgICAgICBpZiAo ZGlzcGxheUJveC5pc05vblJvb3RJbmxpbmVCb3goKSkKKyAgICAgICAgICAgIGRpc3BsYXlCb3gu YWRqdXN0SW5rT3ZlcmZsb3coYWNjdW11bGF0ZWRJbmtPdmVyZmxvd1JlY3QpOworCisgICAgICAg IGF1dG8gcGFyZW50Qm94SXNSb290ID0gJmRpc3BsYXlCb3gubGF5b3V0Qm94KCkucGFyZW50KCkg PT0gJnJvb3QoKTsKKyAgICAgICAgaWYgKHBhcmVudEJveElzUm9vdCkgeworICAgICAgICAgICAg Ly8gV2UgZG9uJ3QgY29sbGVjdCBpbmsgb3ZlcmZsb3cgZm9yIHRoZSByb290IGlubGluZSBib3gu CisgICAgICAgICAgICBhY2N1bXVsYXRlZElua092ZXJmbG93UmVjdCA9IHsgfTsKICAgICAgICAg ICAgIGNvbnRpbnVlOwotICAgICAgICBSRUxFQVNFX0FTU0VSVChtX2lubGluZUJveEluZGV4TWFw LmNvbnRhaW5zKCZpbmxpbmVCb3gpICYmIG1faW5saW5lQm94SW5kZXhNYXAuY29udGFpbnMoJnBh cmVudElubGluZUJveCkpOwotICAgICAgICBhdXRvJiBpbmtPdmVyZmxvdyA9IGJveGVzW21faW5s aW5lQm94SW5kZXhNYXAuZ2V0KCZpbmxpbmVCb3gpXS5pbmtPdmVyZmxvdygpOwotICAgICAgICBh dXRvJiBwYXJlbnREaXNwbGF5Qm94ID0gYm94ZXNbbV9pbmxpbmVCb3hJbmRleE1hcC5nZXQoJnBh cmVudElubGluZUJveCldOwotICAgICAgICBwYXJlbnREaXNwbGF5Qm94LmFkanVzdElua092ZXJm bG93KGlua092ZXJmbG93KTsKKyAgICAgICAgfQorICAgICAgICBhY2N1bXVsYXRlZElua092ZXJm bG93UmVjdC5leHBhbmRUb0NvbnRhaW4oZGlzcGxheUJveC5pbmtPdmVyZmxvdygpKTsKICAgICB9 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyLmgKaW5kZXggODBjM2EwNjY3NWMxNDg5YTE4NGNlZGU4MmEwM2RmM2Y2MjIzMWNkMS4uMjlk YjQxYjhjZWRjMzY2YzRmYTkwZjQ0ODk0MGRiMjY2NDk2NDZkOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKQEAgLTUxLDcgKzUxLDcg QEAgcHJpdmF0ZToKICAgICB2b2lkIHByb2Nlc3NOb25CaWRpQ29udGVudChjb25zdCBMaW5lQnVp bGRlcjo6TGluZUNvbnRlbnQmLCBjb25zdCBMaW5lQm94JiwgY29uc3QgSW5saW5lTGF5b3V0UG9p bnQmIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgRGlzcGxheUJveGVzJik7CiAgICAgdm9pZCBwcm9j ZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3QgTGlu ZUJveCYsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsaW5lQm94TG9naWNhbFRvcExlZnQsIERp c3BsYXlCb3hlcyYpOwogICAgIHZvaWQgcHJvY2Vzc092ZXJmbG93blJ1bnNGb3JFbGxpcHNpcyhE aXNwbGF5Qm94ZXMmLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hMb2dpY2FsUmlnaHQpOwotICAg IHZvaWQgY29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMoY29uc3QgTGluZUJveCYsIERp c3BsYXlCb3hlcyYpOworICAgIHZvaWQgY29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMo RGlzcGxheUJveGVzJik7CiAKICAgICB2b2lkIGFwcGVuZFRleHREaXNwbGF5Qm94KGNvbnN0IExp bmU6OlJ1biYsIGNvbnN0IElubGluZVJlY3QmLCBEaXNwbGF5Qm94ZXMmKTsKICAgICB2b2lkIGFw cGVuZFNvZnRMaW5lQnJlYWtEaXNwbGF5Qm94KGNvbnN0IExpbmU6OlJ1biYsIGNvbnN0IElubGlu ZVJlY3QmLCBEaXNwbGF5Qm94ZXMmKTsKQEAgLTY5LDggKzY5LDggQEAgcHJpdmF0ZToKIAogICAg IGNvbnN0IENvbnRhaW5lckJveCYgbV9mb3JtYXR0aW5nQ29udGV4dFJvb3Q7CiAgICAgSW5saW5l Rm9ybWF0dGluZ1N0YXRlJiBtX2Zvcm1hdHRpbmdTdGF0ZTsKLSAgICBIYXNoTWFwPGNvbnN0IEJv eCosIHNpemVfdD4gbV9pbmxpbmVCb3hJbmRleE1hcDsKICAgICBzaXplX3QgbV9saW5lSW5kZXgg eyAwIH07CisgICAgYm9vbCBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyB7IGZhbHNlIH07CiB9Owog CiB9Cg== 446278 2021-12-07 18:57:19 -0800 2021-12-09 09:11:34 -0800 Patch bug-233950-20211207185718.patch text/plain 14010 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IwMjMyZGYwNzNhZDc3 YTI2ODEwYWZmN2YzOWQ0NGQwOTQxOTUzYy4uMGU2NDM1MTE4YjIxMDM0ZjI0NGQ3MDNjNmFhNGE1 NDUwZmNjMDAyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEyLTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1ha2UgY29s bGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMgcHJvcGFnYXRlIGluayBvdmVyZmxvdyB1c2lu ZyB0aGUgZGlzcGxheSBib3ggbGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjMzOTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3Igc3VwcG9ydGluZyBpbmsg b3ZlcmZsb3cgYWNyb3NzIGJpZGkgYm91bmRhcmllcy4KKworICAgICAgICBUaGUgY3VycmVudCBI YXNoTWFwPGNvbnN0IEJveCosIHNpemVfdD4gYXBwcm9hY2ggZG9lcyBub3Qgd29yayB3aGVuIGEg bGF5b3V0IGJveCBjb3VsZAorICAgICAgICBwcm9kdWNlIG11bHRpcGxlIGlubGluZSBib3ggdHlw ZSBvZiBkaXNwbGF5IGJveGVzIG9uIHRoZSBzYW1lIGxpbmUgKGF0IGJpZGkgYm91bmRhcmllcyku CisgICAgICAgIEluc3RlYWQgbGV0J3MgcHJvcGFnYXRlIGluayBvdmVyZmxvdyBieSB0cmF2ZXJz aW5nIHRoZSBkaXNwbGF5IGJveCBsaXN0IHN0YXJ0aW5nCisgICAgICAgIGF0IHRoZSBlbmQgYW5k IGJ1YmJsZSB1cCB0aGUgaW5mbGF0ZWQgaW5rIG92ZXJmbG93IHJlY3QgdG8gdGhlIHBhcmVudCBp bmxpbmUgYm94ZXMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Y29tcHV0ZUJveFNoYWRvd0lua092ZXJmbG93KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRBdG9taWNJbmxp bmVMZXZlbERpc3BsYXlCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlCb3gpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFNwYW5u aW5nSW5saW5lQm94RGlzcGxheUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjphZGRCb3hTaGFkb3dJbmtPdmVyZmxvdyk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6CisKIDIwMjEtMTItMDYgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVXNlIHRoZSBvYmplY3RSZXBsYWNl bWVudENoYXJhY3RlciAob3RoZXIpIG5ldXRyYWwgY2hhcmFjdGVyIHRvIGluZGljYXRlIElubGlu ZUJveFN0YXJ0L0VuZCBpbmxpbmUgaXRlbXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IDdhYjdjOWU4ZDVhNDUxOWQyMGE1 Mjg0ZTBjODgwOTNiNjQxMjMxNjUuLjlkOWFjZjU4Y2U2ZGQyMTdkN2Y0YWVlZmI2NTljNjUwNDEz NWZmZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcApAQCAtNzQsMTEgKzc0LDExIEBAIERpc3BsYXlCb3hlcyBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYK ICAgICBlbHNlCiAgICAgICAgIHByb2Nlc3NOb25CaWRpQ29udGVudChsaW5lQ29udGVudCwgbGlu ZUJveCwgbGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSwgYm94ZXMpOwogICAgIHByb2Nlc3NP dmVyZmxvd25SdW5zRm9yRWxsaXBzaXMoYm94ZXMsIGxpbmVCb3hMb2dpY2FsUmVjdC5yaWdodCgp KTsKLSAgICBjb2xsZWN0SW5rT3ZlcmZsb3dGb3JJbmxpbmVCb3hlcyhsaW5lQm94LCBib3hlcyk7 CisgICAgY29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94ZXMoYm94ZXMpOwogICAgIHJldHVy biBib3hlczsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGFkZEJveFNoYWRvd0lua092ZXJmbG93 KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lUmVjdCYgaW5rT3ZlcmZsb3cpCitzdGF0 aWMgaW5saW5lIGJvb2wgY29tcHV0ZUJveFNoYWRvd0lua092ZXJmbG93KGNvbnN0IFJlbmRlclN0 eWxlJiBzdHlsZSwgSW5saW5lUmVjdCYgaW5rT3ZlcmZsb3cpCiB7CiAgICAgYXV0byB0b3BCb3hT aGFkb3cgPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIGJvdHRvbUJveFNoYWRvdyA9IExheW91 dFVuaXQgeyB9OwpAQCAtODcsNyArODcsMTAgQEAgc3RhdGljIGlubGluZSB2b2lkIGFkZEJveFNo YWRvd0lua092ZXJmbG93KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lUmVjdCYKICAg ICBhdXRvIGxlZnRCb3hTaGFkb3cgPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIHJpZ2h0Qm94 U2hhZG93ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgc3R5bGUuZ2V0Qm94U2hhZG93SW5saW5lRGly ZWN0aW9uRXh0ZW50KGxlZnRCb3hTaGFkb3csIHJpZ2h0Qm94U2hhZG93KTsKKyAgICBpZiAoIXRv cEJveFNoYWRvdyAmJiAhYm90dG9tQm94U2hhZG93ICYmICFsZWZ0Qm94U2hhZG93ICYmICFyaWdo dEJveFNoYWRvdykKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlua092ZXJmbG93LmluZmxh dGUoSW5saW5lTGF5b3V0VW5pdCB7IHRvcEJveFNoYWRvdyB9LCBJbmxpbmVMYXlvdXRVbml0IHsg cmlnaHRCb3hTaGFkb3cgfSwgSW5saW5lTGF5b3V0VW5pdCB7IGJvdHRvbUJveFNoYWRvdyB9LCBJ bmxpbmVMYXlvdXRVbml0IHsgbGVmdEJveFNoYWRvdyB9KTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0K IAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFRleHREaXNwbGF5Qm94 KGNvbnN0IExpbmU6OlJ1biYgbGluZVJ1biwgY29uc3QgSW5saW5lUmVjdCYgdGV4dFJ1blJlY3Qs IERpc3BsYXlCb3hlcyYgYm94ZXMpCkBAIC0xNjgsMzQgKzE3MSwyNCBAQCB2b2lkIElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kQXRvbWljSW5saW5lTGV2ZWxEaXNwbGF5Qm94KGNv bnN0IExpbmU6OgogICAgIEFTU0VSVChsaW5lUnVuLmxheW91dEJveCgpLmlzQXRvbWljSW5saW5l TGV2ZWxCb3goKSk7CiAKICAgICBhdXRvJiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgp OwotICAgIC8vIEZJWE1FOiBBZGQgaW5rIG92ZXJmbG93IHN1cHBvcnQgZm9yIGF0b21pYyBpbmxp bmUgbGV2ZWwgYm94ZXMgKGUuZy4gYm94IHNoYWRvdykuCisgICAgYXV0byBpbmtPdmVyZmxvdyA9 IFsmXSB7CisgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBib3JkZXJCb3hSZWN0OworICAgICAg ICBjb21wdXRlQm94U2hhZG93SW5rT3ZlcmZsb3coIW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZp cnN0TGluZVN0eWxlKCkgOiBsYXlvdXRCb3guc3R5bGUoKSwgaW5rT3ZlcmZsb3cpOworICAgICAg ICAvLyBBdG9taWMgaW5saW5lIGJveCBjb250cmlidXRlIHRvIHRoZWlyIGlubGluZSBib3ggcGFy ZW50cyBpbmsgb3ZlcmZsb3cgYXQgYWxsIHRpbWVzIChlLmcuIDxzcGFuPjxpbWc+PC9zcGFuPiku CisgICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gbV9jb250ZW50SGFzSW5rT3ZlcmZs b3cgfHwgJmxheW91dEJveC5wYXJlbnQoKSAhPSAmcm9vdCgpOworICAgICAgICByZXR1cm4gaW5r T3ZlcmZsb3c7CisgICAgfTsKICAgICBib3hlcy5hcHBlbmQoeyBtX2xpbmVJbmRleAogICAgICAg ICAsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3gKICAgICAg ICAgLCBsYXlvdXRCb3gKICAgICAgICAgLCBsaW5lUnVuLmJpZGlMZXZlbCgpCiAgICAgICAgICwg Ym9yZGVyQm94UmVjdAotICAgICAgICAsIGJvcmRlckJveFJlY3QKKyAgICAgICAgLCBpbmtPdmVy ZmxvdygpCiAgICAgICAgICwgbGluZVJ1bi5leHBhbnNpb24oKQogICAgICAgICAsIHsgfSB9KTsK LQogICAgIC8vIE5vdGUgdGhhdCBpbmxpbmUgYm94ZXMgYXJlIHJlbGF0aXZlIHRvIHRoZSBsaW5l IGFuZCB0aGVpciB0b3AgcG9zaXRpb24gY2FuIGJlIG5lZ2F0aXZlLgogICAgIC8vIEF0b21pYyBp bmxpbmUgYm94ZXMgYXJlIGFsbCBzZXQuIFRoZWlyIG1hcmdpbi9ib3JkZXIvY29udGVudCBib3gg Z2VvbWV0cmllcyBhcmUgYWxyZWFkeSBjb21wdXRlZC4gV2UganVzdCBoYXZlIHRvIHBvc2l0aW9u IHRoZW0gaGVyZS4KLSAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJv eEdlb21ldHJ5KGxheW91dEJveCk7Ci0gICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcExlZnQo dG9MYXlvdXRQb2ludChib3JkZXJCb3hSZWN0LnRvcExlZnQoKSkpOwotCi0gICAgYXV0byBhZGp1 c3RQYXJlbnRJbmxpbmVCb3hJbmtPdmVyZmxvdyA9IFsmXSB7Ci0gICAgICAgIGF1dG8mIHBhcmVu dElubGluZUJveCA9IGxheW91dEJveC5wYXJlbnQoKTsKLSAgICAgICAgaWYgKCZwYXJlbnRJbmxp bmVCb3ggPT0gJnJvb3QoKSkgewotICAgICAgICAgICAgLy8gV2UgZG9uJ3QgY29sbGVjdCBpbmsg b3ZlcmZsb3cgZm9yIHRoZSByb290IGlubGluZSBib3guCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIH0KLSAgICAgICAgUkVMRUFTRV9BU1NFUlQobV9pbmxpbmVCb3hJbmRleE1hcC5jb250 YWlucygmcGFyZW50SW5saW5lQm94KSk7Ci0KLSAgICAgICAgYXV0byBib3hJbmtPdmVyZmxvdyA9 IGJvcmRlckJveFJlY3Q7Ci0gICAgICAgIGFkZEJveFNoYWRvd0lua092ZXJmbG93KCFtX2xpbmVJ bmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHlsZSgpIDogbGF5b3V0Qm94LnN0eWxlKCksIGJv eElua092ZXJmbG93KTsKLSAgICAgICAgYm94ZXNbbV9pbmxpbmVCb3hJbmRleE1hcC5nZXQoJnBh cmVudElubGluZUJveCldLmFkanVzdElua092ZXJmbG93KGJveElua092ZXJmbG93KTsKLSAgICB9 OwotICAgIGFkanVzdFBhcmVudElubGluZUJveElua092ZXJmbG93KCk7CisgICAgZm9ybWF0dGlu Z1N0YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91 dFBvaW50KGJvcmRlckJveFJlY3QudG9wTGVmdCgpKSk7CiB9CiAKIHZvaWQgSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyOjpzZXRJbmxpbmVCb3hHZW9tZXRyeShjb25zdCBCb3gmIGxheW91dEJv eCwgY29uc3QgSW5saW5lUmVjdCYgcmVjdCwgYm9vbCBpc0ZpcnN0SW5saW5lQm94RnJhZ21lbnQp CkBAIC0yMjAsMjkgKzIxMywzMCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 YXBwZW5kSW5saW5lQm94RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mIGxpbgogICAgIEFTU0VS VChsaW5lUnVuLmxheW91dEJveCgpLmlzSW5saW5lQm94KCkpOwogCiAgICAgYXV0byYgbGF5b3V0 Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKLSAgICBpZiAobGluZWhhc0NvbnRlbnQpIHsKLSAg ICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IFsmXSB7Ci0gICAgICAgICAgICBhdXRvIGlua092ZXJm bG93ID0gaW5saW5lQm94Qm9yZGVyQm94OwotICAgICAgICAgICAgYWRkQm94U2hhZG93SW5rT3Zl cmZsb3coIW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZpcnN0TGluZVN0eWxlKCkgOiBsYXlvdXRC b3guc3R5bGUoKSwgaW5rT3ZlcmZsb3cpOwotICAgICAgICAgICAgcmV0dXJuIGlua092ZXJmbG93 OwotICAgICAgICB9OworCisgICAgaWYgKCFsaW5laGFzQ29udGVudCkgewogICAgICAgICAvLyBG SVhNRTogSXQncyBleHBlY3RlZCB0byBub3QgaGF2ZSBhbnkgYm94ZXMgb24gZW1wdHkgbGluZXMu IFdlIHNob3VsZCByZWNvbnNpZGVyIHRoaXMuCi0gICAgICAgIG1faW5saW5lQm94SW5kZXhNYXAu YWRkKCZsYXlvdXRCb3gsIGJveGVzLnNpemUoKSk7Ci0KLSAgICAgICAgQVNTRVJUKGlubGluZUJv eC5pc0lubGluZUJveCgpKTsKLSAgICAgICAgQVNTRVJUKGlubGluZUJveC5pc0ZpcnN0Qm94KCkp OwotICAgICAgICBib3hlcy5hcHBlbmQoeyBtX2xpbmVJbmRleAotICAgICAgICAgICAgLCBJbmxp bmVEaXNwbGF5OjpCb3g6OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gKLSAgICAgICAgICAgICwgbGF5 b3V0Qm94Ci0gICAgICAgICAgICAsIGxpbmVSdW4uYmlkaUxldmVsKCkKLSAgICAgICAgICAgICwg aW5saW5lQm94Qm9yZGVyQm94Ci0gICAgICAgICAgICAsIGlua092ZXJmbG93KCkKLSAgICAgICAg ICAgICwgeyB9Ci0gICAgICAgICAgICAsIHsgfQotICAgICAgICAgICAgLCBpbmxpbmVCb3guaGFz Q29udGVudCgpCi0gICAgICAgICAgICAsIGlzRmlyc3RMYXN0Qm94KGlubGluZUJveCkgfSk7Cisg ICAgICAgIHNldElubGluZUJveEdlb21ldHJ5KGxheW91dEJveCwgaW5saW5lQm94Qm9yZGVyQm94 LCB0cnVlKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIGF1dG8gaW5rT3ZlcmZsb3cg PSBbJl0geworICAgICAgICBhdXRvIGlua092ZXJmbG93ID0gaW5saW5lQm94Qm9yZGVyQm94Owor ICAgICAgICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNvbXB1dGVCb3hTaGFkb3dJbmtPdmVy ZmxvdyghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJv eC5zdHlsZSgpLCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3c7CisgICAg ICAgIHJldHVybiBpbmtPdmVyZmxvdzsKKyAgICB9OworICAgIEFTU0VSVChpbmxpbmVCb3guaXNJ bmxpbmVCb3goKSk7CisgICAgQVNTRVJUKGlubGluZUJveC5pc0ZpcnN0Qm94KCkpOworICAgIGJv eGVzLmFwcGVuZCh7IG1fbGluZUluZGV4CisgICAgICAgICwgSW5saW5lRGlzcGxheTo6Qm94OjpU eXBlOjpOb25Sb290SW5saW5lQm94CisgICAgICAgICwgbGF5b3V0Qm94CisgICAgICAgICwgbGlu ZVJ1bi5iaWRpTGV2ZWwoKQorICAgICAgICAsIGlubGluZUJveEJvcmRlckJveAorICAgICAgICAs IGlua092ZXJmbG93KCkKKyAgICAgICAgLCB7IH0KKyAgICAgICAgLCB7IH0KKyAgICAgICAgLCBp bmxpbmVCb3guaGFzQ29udGVudCgpCisgICAgICAgICwgaXNGaXJzdExhc3RCb3goaW5saW5lQm94 KSB9KTsKICAgICAvLyBUaGlzIGlubGluZSBib3ggc2hvd2VkIHVwIGZpcnN0IG9uIHRoaXMgbGlu ZS4KICAgICBzZXRJbmxpbmVCb3hHZW9tZXRyeShsYXlvdXRCb3gsIGlubGluZUJveEJvcmRlckJv eCwgdHJ1ZSk7CiB9CkBAIC0yNTIsMTEgKzI0Niw5IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyOjphcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6 CiAgICAgQVNTRVJUKGxpbmVSdW4ubGF5b3V0Qm94KCkuaXNJbmxpbmVCb3goKSk7CiAKICAgICBh dXRvJiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOwotICAgIG1faW5saW5lQm94SW5k ZXhNYXAuYWRkKCZsYXlvdXRCb3gsIGJveGVzLnNpemUoKSk7Ci0KICAgICBhdXRvIGlua092ZXJm bG93ID0gWyZdIHsKICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IGlubGluZUJveEJvcmRlckJv eDsKLSAgICAgICAgYWRkQm94U2hhZG93SW5rT3ZlcmZsb3coIW1fbGluZUluZGV4ID8gbGF5b3V0 Qm94LmZpcnN0TGluZVN0eWxlKCkgOiBsYXlvdXRCb3guc3R5bGUoKSwgaW5rT3ZlcmZsb3cpOwor ICAgICAgICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNvbXB1dGVCb3hTaGFkb3dJbmtPdmVy ZmxvdyghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJv eC5zdHlsZSgpLCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3c7CiAgICAg ICAgIHJldHVybiBpbmtPdmVyZmxvdzsKICAgICB9OwogICAgIEFTU0VSVCghaW5saW5lQm94Lmlz Rmlyc3RCb3goKSk7CkBAIC0yNzAsNyArMjYyLDYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OmFwcGVuZFNwYW5uaW5nSW5saW5lQm94RGlzcGxheUJveChjb25zdCBMaW5lOjoK ICAgICAgICAgLCB7IH0KICAgICAgICAgLCBpbmxpbmVCb3guaGFzQ29udGVudCgpCiAgICAgICAg ICwgaXNGaXJzdExhc3RCb3goaW5saW5lQm94KSB9KTsKLQogICAgIC8vIE1pZGRsZSBvciBlbmQg b2YgdGhlIGlubGluZSBib3guIExldCdzIHN0cmV0Y2ggdGhlIGJveCBhcyBuZWVkZWQuCiAgICAg c2V0SW5saW5lQm94R2VvbWV0cnkobGF5b3V0Qm94LCBpbmxpbmVCb3hCb3JkZXJCb3gsIGZhbHNl KTsKIH0KQEAgLTYwOCwyNyArNTk5LDMwIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjpwcm9jZXNzT3ZlcmZsb3duUnVuc0ZvckVsbGlwc2lzKERpc3BsYXlCb3hlcyYKICAgICAg ICAgLCBJbmxpbmVEaXNwbGF5OjpCb3g6OlRleHQgeyAwLCAxLCBlbGxpcHNpc1N0ci0+c3RyaW5n KCkgfSB9KTsKIH0KIAotdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNvbGxlY3RJ bmtPdmVyZmxvd0ZvcklubGluZUJveGVzKGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIERpc3BsYXlC b3hlcyYgYm94ZXMpCit2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y29sbGVjdElu a092ZXJmbG93Rm9ySW5saW5lQm94ZXMoRGlzcGxheUJveGVzJiBib3hlcykKIHsKLSAgICBpZiAo bV9pbmxpbmVCb3hJbmRleE1hcC5pc0VtcHR5KCkgfHwgIWxpbmVCb3guaGFzQ29udGVudCgpKSB7 Ci0gICAgICAgIC8vIFRoaXMgbGluZSBoYXMgbm8gaW5saW5lIGJveCAob25seSByb290LCBidXQg d2UgZG9uJ3QgY29sbGVjdCBpbmsgb3ZlcmZsb3cgZm9yIHRoZSByb290IGlubGluZSBib3ggYXRt KQorICAgIGlmICghbV9jb250ZW50SGFzSW5rT3ZlcmZsb3cpCiAgICAgICAgIHJldHVybjsKLSAg ICB9Ci0KLSAgICBhdXRvJiBub25Sb290SW5saW5lTGV2ZWxCb3hlcyA9IGxpbmVCb3gubm9uUm9v dElubGluZUxldmVsQm94ZXMoKTsKICAgICAvLyBWaXNpdCB0aGUgaW5saW5lIGJveGVzIGFuZCBw cm9wYWdhdGUgaW5rIG92ZXJmbG93IHRvIHRoZWlyIHBhcmVudHMgLWV4Y2VwdCB0byB0aGUgcm9v dCBpbmxpbmUgYm94LgogICAgIC8vIChlLmcuIDxzcGFuIHN0eWxlPSJmb250LXNpemU6IDEwcHg7 Ij5TbWFsbCBmb250IHNpemU8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAzMDBweDsiPkxhcmdlciBm b250IHNpemUuIFRoaXMgb3ZlcmZsb3dzIHRoZSB0b3AgbW9zdCBzcGFuLjwvc3Bhbj48L3NwYW4+ KS4KLSAgICBmb3IgKHNpemVfdCBpbmRleCA9IG5vblJvb3RJbmxpbmVMZXZlbEJveGVzLnNpemUo KTsgaW5kZXgtLTspIHsKLSAgICAgICAgaWYgKCFub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRl eF0uaXNJbmxpbmVCb3goKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBhdXRvJiBp bmxpbmVCb3ggPSBub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF0ubGF5b3V0Qm94KCk7Ci0g ICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGlubGluZUJveC5wYXJlbnQoKTsKLSAgICAg ICAgaWYgKCZwYXJlbnRJbmxpbmVCb3ggPT0gJnJvb3QoKSkKKyAgICBhdXRvIGFjY3VtdWxhdGVk SW5rT3ZlcmZsb3dSZWN0ID0gSW5saW5lUmVjdCB7IHsgfSwgeyB9IH07CisgICAgZm9yIChzaXpl X3QgaW5kZXggPSBib3hlcy5zaXplKCk7IGluZGV4LS07KSB7CisgICAgICAgIGF1dG8mIGRpc3Bs YXlCb3ggPSBib3hlc1tpbmRleF07CisKKyAgICAgICAgYXV0byBtYXlIYXZlSW5rT3ZlcmZsb3cg PSBkaXNwbGF5Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSB8fCBkaXNwbGF5Qm94LmlzR2Vu ZXJpY0lubGluZUxldmVsQm94KCkgfHwgZGlzcGxheUJveC5pc05vblJvb3RJbmxpbmVCb3goKTsK KyAgICAgICAgaWYgKCFtYXlIYXZlSW5rT3ZlcmZsb3cpCiAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgUkVMRUFTRV9BU1NFUlQobV9pbmxpbmVCb3hJbmRleE1hcC5jb250YWlucygmaW5s aW5lQm94KSAmJiBtX2lubGluZUJveEluZGV4TWFwLmNvbnRhaW5zKCZwYXJlbnRJbmxpbmVCb3gp KTsKLSAgICAgICAgYXV0byYgaW5rT3ZlcmZsb3cgPSBib3hlc1ttX2lubGluZUJveEluZGV4TWFw LmdldCgmaW5saW5lQm94KV0uaW5rT3ZlcmZsb3coKTsKLSAgICAgICAgYXV0byYgcGFyZW50RGlz cGxheUJveCA9IGJveGVzW21faW5saW5lQm94SW5kZXhNYXAuZ2V0KCZwYXJlbnRJbmxpbmVCb3gp XTsKLSAgICAgICAgcGFyZW50RGlzcGxheUJveC5hZGp1c3RJbmtPdmVyZmxvdyhpbmtPdmVyZmxv dyk7CisgICAgICAgIGlmIChkaXNwbGF5Qm94LmlzTm9uUm9vdElubGluZUJveCgpICYmICFhY2N1 bXVsYXRlZElua092ZXJmbG93UmVjdC5pc0VtcHR5KCkpCisgICAgICAgICAgICBkaXNwbGF5Qm94 LmFkanVzdElua092ZXJmbG93KGFjY3VtdWxhdGVkSW5rT3ZlcmZsb3dSZWN0KTsKKworICAgICAg ICAvLyBXZSBzdG9wIGNvbGxlY3RpbmcgaW5rIG92ZXJmbG93IGZvciBhdCByb290IGlubGluZSBi b3ggKGkuZS4gZG9uJ3QgaW5mbGF0ZSB0aGUgcm9vdCBpbmxpbmUgYm94IHdpdGggdGhlIGlubGlu ZSBjb250ZW50IGhlcmUpLgorICAgICAgICBhdXRvIHBhcmVudEJveElzUm9vdCA9ICZkaXNwbGF5 Qm94LmxheW91dEJveCgpLnBhcmVudCgpID09ICZyb290KCk7CisgICAgICAgIGlmIChwYXJlbnRC b3hJc1Jvb3QpCisgICAgICAgICAgICBhY2N1bXVsYXRlZElua092ZXJmbG93UmVjdCA9IElubGlu ZVJlY3QgeyB7IH0sIHsgfSB9OworICAgICAgICBlbHNlIGlmIChhY2N1bXVsYXRlZElua092ZXJm bG93UmVjdC5pc0VtcHR5KCkpCisgICAgICAgICAgICBhY2N1bXVsYXRlZElua092ZXJmbG93UmVj dCA9IGRpc3BsYXlCb3guaW5rT3ZlcmZsb3coKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg YWNjdW11bGF0ZWRJbmtPdmVyZmxvd1JlY3QuZXhwYW5kVG9Db250YWluKGRpc3BsYXlCb3guaW5r T3ZlcmZsb3coKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4IDgwYzNhMDY2NzVjMTQ4OWExODRjZWRlODJh MDNkZjNmNjIyMzFjZDEuLjI5ZGI0MWI4Y2VkYzM2NmM0ZmE5MGY0NDg5NDBkYjI2NjQ5NjQ2ZDkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5oCkBAIC01MSw3ICs1MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwcm9jZXNzTm9uQmlkaUNv bnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3QgTGluZUJveCYsIGNv bnN0IElubGluZUxheW91dFBvaW50JiBsaW5lQm94TG9naWNhbFRvcExlZnQsIERpc3BsYXlCb3hl cyYpOwogICAgIHZvaWQgcHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5l Q29udGVudCYsIGNvbnN0IExpbmVCb3gmLCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJv eExvZ2ljYWxUb3BMZWZ0LCBEaXNwbGF5Qm94ZXMmKTsKICAgICB2b2lkIHByb2Nlc3NPdmVyZmxv d25SdW5zRm9yRWxsaXBzaXMoRGlzcGxheUJveGVzJiwgSW5saW5lTGF5b3V0VW5pdCBsaW5lQm94 TG9naWNhbFJpZ2h0KTsKLSAgICB2b2lkIGNvbGxlY3RJbmtPdmVyZmxvd0ZvcklubGluZUJveGVz KGNvbnN0IExpbmVCb3gmLCBEaXNwbGF5Qm94ZXMmKTsKKyAgICB2b2lkIGNvbGxlY3RJbmtPdmVy Zmxvd0ZvcklubGluZUJveGVzKERpc3BsYXlCb3hlcyYpOwogCiAgICAgdm9pZCBhcHBlbmRUZXh0 RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mLCBjb25zdCBJbmxpbmVSZWN0JiwgRGlzcGxheUJv eGVzJik7CiAgICAgdm9pZCBhcHBlbmRTb2Z0TGluZUJyZWFrRGlzcGxheUJveChjb25zdCBMaW5l OjpSdW4mLCBjb25zdCBJbmxpbmVSZWN0JiwgRGlzcGxheUJveGVzJik7CkBAIC02OSw4ICs2OSw4 IEBAIHByaXZhdGU6CiAKICAgICBjb25zdCBDb250YWluZXJCb3gmIG1fZm9ybWF0dGluZ0NvbnRl eHRSb290OwogICAgIElubGluZUZvcm1hdHRpbmdTdGF0ZSYgbV9mb3JtYXR0aW5nU3RhdGU7Ci0g ICAgSGFzaE1hcDxjb25zdCBCb3gqLCBzaXplX3Q+IG1faW5saW5lQm94SW5kZXhNYXA7CiAgICAg c2l6ZV90IG1fbGluZUluZGV4IHsgMCB9OworICAgIGJvb2wgbV9jb250ZW50SGFzSW5rT3ZlcmZs b3cgeyBmYWxzZSB9OwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lUmVjdC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lUmVjdC5oCmluZGV4IDlmNWRj NTczNGU0MWI1OTJmYmQ5OWUwMjY1OGRiN2NhNDk1OWVhNjguLmQ2YzBjNTlkYjk0YzY4Y2E5ZDcx NmEyODU2ZDhmYzc4ODVlMmIwZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVJlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVSZWN0LmgKQEAgLTcxLDYg KzcxLDggQEAgcHVibGljOgogICAgIHZvaWQgaW5mbGF0ZShJbmxpbmVMYXlvdXRVbml0KTsKICAg ICB2b2lkIGluZmxhdGUoSW5saW5lTGF5b3V0VW5pdCB0b3AsIElubGluZUxheW91dFVuaXQgcmln aHQsIElubGluZUxheW91dFVuaXQgYm90dG9tLCBJbmxpbmVMYXlvdXRVbml0IGxlZnQpOwogCisg ICAgYm9vbCBpc0VtcHR5KCkgY29uc3Q7CisKICAgICBvcGVyYXRvciBJbmxpbmVMYXlvdXRSZWN0 KCkgY29uc3Q7CiAKIHByaXZhdGU6CkBAIC0zMDgsNiArMzEwLDEyIEBAIGlubGluZSB2b2lkIElu bGluZVJlY3Q6OmluZmxhdGUoSW5saW5lTGF5b3V0VW5pdCB0b3AsIElubGluZUxheW91dFVuaXQg cmlnaHQsIEluCiAgICAgbV9yZWN0LnNldEhlaWdodChtX3JlY3QuaGVpZ2h0KCkgKyB0b3AgKyBi b3R0b20pOwogfQogCitpbmxpbmUgYm9vbCBJbmxpbmVSZWN0Ojppc0VtcHR5KCkgY29uc3QKK3sK KyAgICBBU1NFUlQoaGFzVmFsaWRHZW9tZXRyeSgpKTsKKyAgICByZXR1cm4gbV9yZWN0LmlzRW1w dHkoKTsKK30KKwogaW5saW5lIElubGluZVJlY3Q6Om9wZXJhdG9yIElubGluZUxheW91dFJlY3Qo KSBjb25zdAogewogICAgIEFTU0VSVChoYXNWYWxpZEdlb21ldHJ5KCkpOyAK