234490 2021-12-19 12:37:15 -0800 [LFC][IFC] InlineDisplay::Line has physical geometry 2021-12-20 07:14:20 -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 1825471 0 zalan 2021-12-19 12:37:15 -0800 ssia 1825472 1 447557 zalan 2021-12-19 12:39:01 -0800 Created attachment 447557 Patch 1825529 2 447578 zalan 2021-12-19 20:57:26 -0800 Created attachment 447578 Patch 1825598 3 ews-feeder 2021-12-20 07:13:01 -0800 Committed r287259 (245415@main): <https://commits.webkit.org/245415@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447578. 1825599 4 webkit-bug-importer 2021-12-20 07:14:20 -0800 <rdar://problem/86723002> 447557 2021-12-19 12:39:01 -0800 2021-12-19 20:57:24 -0800 Patch bug-234490-20211219123900.patch text/plain 19941 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI0NTQ4MWIwMzEyOWE5 ZDA5MDFlNDUyNGEwNTQzOGI0N2Y1MzdkNy4uOGIzNWExZTk1MDA2OTY5MGE5NGNlNjFmNzJjNGU4 OTU5NGQ5ZTM3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTEyLTE5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIElubGluZURp c3BsYXk6OkxpbmUgaGFzIHBoeXNpY2FsIGdlb21ldHJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ0OTAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdGhlIHRlcm0gImxvZ2ljYWwiIGZyb20g ZnVuY3Rpb24gbmFtZXMgYW5kIHZhcmlhYmxlcy4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvYmxvY2svQmxvY2tGb3JtYXR0aW5nR2VvbWV0cnkuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFj ZWRDb250ZW50SGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojp1c2VkQ29udGVudEhl aWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9t ZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMpOgorICAgICAg ICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmxpbmVCb3hS ZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmNvbnRl bnRMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmNv bnRlbnRXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpMaW5l Ojptb3ZlVmVydGljYWxseSk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpMaW5l OjpMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmxpbmVCb3hM b2dpY2FsUmVjdCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNw bGF5OjpMaW5lOjpjb250ZW50TG9naWNhbExlZnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6SW5saW5lRGlzcGxheTo6TGluZTo6Y29udGVudExvZ2ljYWxXaWR0aCBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OmxpbmVPdmVyZmxvd1dpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVn cmF0aW9uOjpJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzIGNvbnN0KToK KyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OnNob3dJbmxpbmVUcmVlQW5kUnVucyk6CisKIDIwMjEtMTIt MTkgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10g QWRkIHN1cHBvcnQgZm9yIFJUTCB0ZXh0LWluZGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9ibG9jay9CbG9ja0Zvcm1hdHRpbmdHZW9tZXRy eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL0Js b2NrRm9ybWF0dGluZ0dlb21ldHJ5LmNwcAppbmRleCBiMWE1N2ZiN2VhZjM3NDUyZWIxNDdhMjY0 OTFiMGJhNjQ3MTRkN2MyLi5iNDJjM2UxMzgzZDgzNTJkZjMzMWM2YjAzZGI0YmIzOTFkYzE4NjBk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Js b2NrL0Jsb2NrRm9ybWF0dGluZ0dlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL0Jsb2NrRm9ybWF0dGluZ0dlb21ldHJ5LmNwcApA QCAtODcsNyArODcsNyBAQCBDb250ZW50SGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0dl b21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZENvbnRlbnRIZWlnaHRBbgogICAgICAgICAgICAgYXV0 byYgbGluZXMgPSBpbmxpbmVGb3JtYXR0aW5nU3RhdGUubGluZXMoKTsKICAgICAgICAgICAgIC8v IEV2ZW4gZW1wdHkgY29udGFpbmVycyBnZW5lcmF0ZSBvbmUgbGluZS4gCiAgICAgICAgICAgICBB U1NFUlQoIWxpbmVzLmlzRW1wdHkoKSk7Ci0gICAgICAgICAgICByZXR1cm4geyB0b0xheW91dFVu aXQobGluZXMubGFzdCgpLmxpbmVCb3hMb2dpY2FsUmVjdCgpLmJvdHRvbSgpICsgaW5saW5lRm9y bWF0dGluZ1N0YXRlLmNsZWFyR2FwQWZ0ZXJMYXN0TGluZSgpKSAtIGJvcmRlckFuZFBhZGRpbmdU b3AsIG5vbkNvbGxhcHNlZE1hcmdpbiB9OworICAgICAgICAgICAgcmV0dXJuIHsgdG9MYXlvdXRV bml0KGxpbmVzLmxhc3QoKS5saW5lQm94UmVjdCgpLmJvdHRvbSgpICsgaW5saW5lRm9ybWF0dGlu Z1N0YXRlLmNsZWFyR2FwQWZ0ZXJMYXN0TGluZSgpKSAtIGJvcmRlckFuZFBhZGRpbmdUb3AsIG5v bkNvbGxhcHNlZE1hcmdpbiB9OwogICAgICAgICB9CiAKICAgICAgICAgLy8gMi4gdGhlIGJvdHRv bSBlZGdlIG9mIHRoZSBib3R0b20gKHBvc3NpYmx5IGNvbGxhcHNlZCkgbWFyZ2luIG9mIGl0cyBs YXN0IGluLWZsb3cgY2hpbGQsIGlmIHRoZSBjaGlsZCdzIGJvdHRvbSBtYXJnaW4uLi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBmMzY2 YjIyNzdlODE0MjEwNGZmZDljNzEwMDk3YzMwNzljMTIxZTM2Li45ZTMwNzIyMWZmYTg2ZTMyM2U0 MWRiOWRjMDU0ZTlhYjY1OWEzNmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xODUsOCArMTg1LDggQEAgTGF5b3V0VW5pdCBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6dXNlZENvbnRlbnRIZWlnaHQoKSBjb25zdAogICAgIGF1dG8m IGxpbmVzID0gZm9ybWF0dGluZ1N0YXRlKCkubGluZXMoKTsKICAgICAvLyBFdmVuIGVtcHR5IGNv bnRlbnQgZ2VuZXJhdGVzIGEgbGluZS4KICAgICBBU1NFUlQoIWxpbmVzLmlzRW1wdHkoKSk7Ci0g ICAgYXV0byB0b3AgPSBMYXlvdXRVbml0IHsgbGluZXMuZmlyc3QoKS5saW5lQm94TG9naWNhbFJl Y3QoKS50b3AoKSB9OwotICAgIGF1dG8gYm90dG9tID0gTGF5b3V0VW5pdCB7IGxpbmVzLmxhc3Qo KS5saW5lQm94TG9naWNhbFJlY3QoKS5ib3R0b20oKSArIGZvcm1hdHRpbmdTdGF0ZSgpLmNsZWFy R2FwQWZ0ZXJMYXN0TGluZSgpIH07CisgICAgYXV0byB0b3AgPSBMYXlvdXRVbml0IHsgbGluZXMu Zmlyc3QoKS5saW5lQm94UmVjdCgpLnRvcCgpIH07CisgICAgYXV0byBib3R0b20gPSBMYXlvdXRV bml0IHsgbGluZXMubGFzdCgpLmxpbmVCb3hSZWN0KCkuYm90dG9tKCkgKyBmb3JtYXR0aW5nU3Rh dGUoKS5jbGVhckdhcEFmdGVyTGFzdExpbmUoKSB9OwogCiAgICAgYXV0byBmbG9hdGluZ0NvbnRl eHQgPSBGbG9hdGluZ0NvbnRleHQgeyAqdGhpcywgZm9ybWF0dGluZ1N0YXRlKCkuZmxvYXRpbmdT dGF0ZSgpIH07CiAgICAgaWYgKGF1dG8gZmxvYXRCb3R0b20gPSBmbG9hdGluZ0NvbnRleHQuYm90 dG9tKCkpIHsKQEAgLTMwNSw3ICszMDUsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlU3RhdGljUG9zaXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcgogICAg ICAgICAgICAgLy8gVGhpcyBpcyB0aGUgZmlyc3QgKG5vbi1mbG9hdCljaGlsZC4gTGV0J3MgcGxh Y2UgaXQgdG8gdGhlIGxlZnQgb2YgdGhlIGZpcnN0IGJveC4KICAgICAgICAgICAgIC8vIDxkaXY+ PGltZyBzdHlsZT0icG9zaXRpb246IGFic29sdXRlIj50ZXh0IGNvbnRlbnQ8L2Rpdj4KICAgICAg ICAgICAgIEFTU0VSVChib3hlcy5zaXplKCkpOwotICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0 cnkuc2V0TG9naWNhbFRvcExlZnQoeyBib3hlc1swXS5sZWZ0KCksIGxpbmVzWzBdLmxpbmVCb3hM b2dpY2FsUmVjdCgpLnRvcCgpIH0pOworICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0cnkuc2V0 TG9naWNhbFRvcExlZnQoeyBib3hlc1swXS5sZWZ0KCksIGxpbmVzWzBdLmxpbmVCb3hSZWN0KCku dG9wKCkgfSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCkBAIC0zNDYsMTgg KzM0NiwxOCBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9z aXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcgogICAgICAgICAgICAgICAgICAgICAg ICAgPyBCb3hHZW9tZXRyeTo6Ym9yZGVyQm94TGVmdChpbmxpbmVCb3hCb3hHZW9tZXRyeSkgKyBp bmxpbmVCb3hCb3hHZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpCiAgICAgICAgICAgICAgICAgICAg ICAgICA6IEJveEdlb21ldHJ5Ojpib3JkZXJCb3hSZWN0KGlubGluZUJveEJveEdlb21ldHJ5KS5y aWdodCgpOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBvdXRPZkZsb3dHZW9t ZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh7IGxlZnQsIGxpbmVzW3ByZXZpb3VzQm94LmxpbmVJbmRl eCgpXS5saW5lQm94TG9naWNhbFJlY3QoKS50b3AoKSB9KTsKKyAgICAgICAgICAgICAgICBvdXRP ZkZsb3dHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh7IGxlZnQsIGxpbmVzW3ByZXZpb3VzQm94 LmxpbmVJbmRleCgpXS5saW5lQm94UmVjdCgpLnRvcCgpIH0pOwogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKG5leHRCb3gpIHsKICAgICAg ICAgICAgICAgICAvLyBUaGUgb3V0IG9mIGZsb3cgYm94IGlzIHBsYWNlZCBhdCB0aGUgYmVnaW5u aW5nIG9mIHRoZSBuZXh0IGxpbmUgKHdoZXJlIHRoZSBmaXJzdCBib3ggb24gdGhlIGxpbmUgaXMp LgogICAgICAgICAgICAgICAgIC8vIDxkaXY+dGV4dDxicj48aW1nIHN0eWxlPSJwb3NpdGlvbjog YWJzb2x1dGUiPjxpbWcgc3R5bGU9InBvc2l0aW9uOiBhYnNvbHV0ZSI+Y29udGVudDwvZGl2Pgot ICAgICAgICAgICAgICAgIG91dE9mRmxvd0dlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHsgbmV4 dEJveC0+bGVmdCgpLCBsaW5lc1tuZXh0Qm94LT5saW5lSW5kZXgoKV0ubGluZUJveExvZ2ljYWxS ZWN0KCkudG9wKCkgfSk7CisgICAgICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0cnkuc2V0TG9n aWNhbFRvcExlZnQoeyBuZXh0Qm94LT5sZWZ0KCksIGxpbmVzW25leHRCb3gtPmxpbmVJbmRleCgp XS5saW5lQm94UmVjdCgpLnRvcCgpIH0pOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgYXV0byYgbGFzdExpbmVMb2dpY2FsUmVjdCA9IGxpbmVz W3ByZXZpb3VzQm94LmxpbmVJbmRleCgpXS5saW5lQm94TG9naWNhbFJlY3QoKTsKKyAgICAgICAg ICAgIGF1dG8mIGxhc3RMaW5lTG9naWNhbFJlY3QgPSBsaW5lc1twcmV2aW91c0JveC5saW5lSW5k ZXgoKV0ubGluZUJveFJlY3QoKTsKICAgICAgICAgICAgIC8vIFRoaXMgb3V0LW9mLWZsb3cgYm94 IGlzIHRoZSBsYXN0IGJveC4KICAgICAgICAgICAgIC8vIEZJWE1FOiBVc2UgaXNMaW5lQnJlYWsg aW5zdGVhZCB0byBjb3ZlciBwcmVzZXJ2ZWQgbmV3IGxpbmVzIHRvby4KICAgICAgICAgICAgIGlm IChwcmV2aW91c0JveC5sYXlvdXRCb3goKS5pc0xpbmVCcmVha0JveCgpKSB7CkBAIC01NTIsNyAr NTUyLDcgQEAgSW5saW5lUmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21l dHJ5Rm9yTGluZUNvbnRlbnQoY29uc3QgTGluZUJ1aWwKICAgICBhdXRvIGN1cnJlbnRMaW5lSW5k ZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5zaXplKCk7CiAKICAgICBhdXRvIGxpbmVBbmRM aW5lQm94ID0gTGluZUJveEJ1aWxkZXIoKnRoaXMpLmJ1aWxkKGxpbmVDb250ZW50LCBjdXJyZW50 TGluZUluZGV4KTsKLSAgICBhdXRvIGxpbmVCb3hMb2dpY2FsUmVjdCA9IGxpbmVBbmRMaW5lQm94 LmxpbmUubGluZUJveExvZ2ljYWxSZWN0KCk7CisgICAgYXV0byBsaW5lQm94TG9naWNhbFJlY3Qg PSBsaW5lQW5kTGluZUJveC5saW5lLmxpbmVCb3hSZWN0KCk7CiAKICAgICBhdXRvIGlubGluZUNv bnRlbnRCdWlsZGVyID0gSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyIHsgcm9vdCgpLCBmb3Jt YXR0aW5nU3RhdGUgfTsKICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkQm94ZXMoaW5saW5lQ29udGVu dEJ1aWxkZXIuYnVpbGQobGluZUNvbnRlbnQsIGxpbmVBbmRMaW5lQm94LmxpbmVCb3gsIGxpbmVC b3hMb2dpY2FsUmVjdCwgY3VycmVudExpbmVJbmRleCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCmluZGV4IGM2NDhhMTU3MzM1NTg2NTFmZTFhZGVkN2Zi NDBlZDM3NWEyYmU2YjcuLjAwMDgzOTE0MDcyYmIyZTAzYzMxZWI5YzhkOTU4M2RkMTVhYTg5MGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKQEAgLTEx OSwxMCArMTE5LDEwIEBAIExpbmVCb3hCdWlsZGVyOjpMaW5lQW5kTGluZUJveCBMaW5lQm94QnVp bGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICBwaHlz aWNhbExlZnQgLT0gbGluZUNvbnRlbnQubGluZU1hcmdpblN0YXJ0OwogICAgICAgICB9CiAgICAg ICAgIC8vIEZJWE1FOiBVc2UgcGh5c2ljYWwgZ2VvbWV0cnkgaGVyZS4KLSAgICAgICAgYXV0byBs aW5lQm94TG9naWNhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxU b3BMZWZ0LnkoKSwgcGh5c2ljYWxMZWZ0LCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCBs aW5lQm94TG9naWNhbEhlaWdodCB9OwotICAgICAgICBhdXRvIHNjcm9sbGFibGVPdmVyZmxvd1Jl Y3QgPSBsaW5lQm94TG9naWNhbFJlY3Q7CisgICAgICAgIGF1dG8gbGluZUJveFJlY3QgPSBJbmxp bmVSZWN0IHsgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxUb3BMZWZ0LnkoKSwgcGh5c2ljYWxMZWZ0 LCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCBsaW5lQm94TG9naWNhbEhlaWdodCB9Owor ICAgICAgICBhdXRvIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QgPSBsaW5lQm94UmVjdDsKICAgICAg ICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gucm9vdElubGluZUJveCgpOwotICAgICAg ICBhdXRvIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSA9IElubGluZURpc3BsYXk6OkxpbmU6OkVuY2xv c2luZ1RvcEFuZEJvdHRvbSB7IGxpbmVCb3hMb2dpY2FsUmVjdC50b3AoKSArIHJvb3RJbmxpbmVC b3gubG9naWNhbFRvcCgpLCBsaW5lQm94TG9naWNhbFJlY3QudG9wKCkgKyByb290SW5saW5lQm94 LmxvZ2ljYWxCb3R0b20oKSB9OworICAgICAgICBhdXRvIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSA9 IElubGluZURpc3BsYXk6OkxpbmU6OkVuY2xvc2luZ1RvcEFuZEJvdHRvbSB7IGxpbmVCb3hSZWN0 LnRvcCgpICsgcm9vdElubGluZUJveC5sb2dpY2FsVG9wKCksIGxpbmVCb3hSZWN0LnRvcCgpICsg cm9vdElubGluZUJveC5sb2dpY2FsQm90dG9tKCkgfTsKIAogICAgICAgICBmb3IgKGF1dG8mIGlu bGluZUxldmVsQm94IDogbGluZUJveC5ub25Sb290SW5saW5lTGV2ZWxCb3hlcygpKSB7CiAgICAg ICAgICAgICBpZiAoIWlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSAmJiAh aW5saW5lTGV2ZWxCb3guaXNJbmxpbmVCb3goKSkKQEAgLTEzMywxMSArMTMzLDExIEBAIExpbmVC b3hCdWlsZGVyOjpMaW5lQW5kTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3QgTGlu ZUJ1aWxkZXI6OkxpbmVDb250CiAKICAgICAgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0 b21pY0lubGluZUxldmVsQm94KCkpIHsKICAgICAgICAgICAgICAgICBib3JkZXJCb3ggPSBsaW5l Qm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGZv cm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KSk7Ci0gICAgICAgICAg ICAgICAgYm9yZGVyQm94Lm1vdmVCeShsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpKTsKKyAg ICAgICAgICAgICAgICBib3JkZXJCb3gubW92ZUJ5KGxpbmVCb3hSZWN0LnRvcExlZnQoKSk7CiAg ICAgICAgICAgICB9IGVsc2UgaWYgKGlubGluZUxldmVsQm94LmlzSW5saW5lQm94KCkpIHsKICAg ICAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2Vv bWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICBib3JkZXJCb3ggPSBsaW5l Qm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7 Ci0gICAgICAgICAgICAgICAgYm9yZGVyQm94Lm1vdmVCeShsaW5lQm94TG9naWNhbFJlY3QudG9w TGVmdCgpKTsKKyAgICAgICAgICAgICAgICBib3JkZXJCb3gubW92ZUJ5KGxpbmVCb3hSZWN0LnRv cExlZnQoKSk7CiAgICAgICAgICAgICAgICAgLy8gQ29sbGVjdCBzY3JvbGxhYmxlIG92ZXJmbG93 IGZyb20gaW5saW5lIGJveGVzLiBBbGwgb3RoZXIgaW5saW5lIGxldmVsIGJveGVzIChlLmcgYXRv bWljIGlubGluZSBsZXZlbCBib3hlcykgc3RyZXRjaCB0aGUgbGluZS4KICAgICAgICAgICAgICAg ICBhdXRvIGhhc1Njcm9sbGFibGVDb250ZW50ID0gWyZdIHsKICAgICAgICAgICAgICAgICAgICAg Ly8gSW4gc3RhbmRhcmRzIG1vZGUsIGlubGluZSBib3hlcyBhbHdheXMgc3RhcnQgd2l0aCBhbiBp bWFnaW5hcnkgc3RydXQuCkBAIC0xNTMsNyArMTUzLDcgQEAgTGluZUJveEJ1aWxkZXI6OkxpbmVB bmRMaW5lQm94IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKICAgICAgICAgICAgIGVuY2xvc2luZ1RvcEFuZEJvdHRvbS50b3AgPSBzdGQ6Om1pbihlbmNs b3NpbmdUb3BBbmRCb3R0b20udG9wLCBib3JkZXJCb3gudG9wKCkpOwogICAgICAgICAgICAgZW5j bG9zaW5nVG9wQW5kQm90dG9tLmJvdHRvbSA9IHN0ZDo6bWF4KGVuY2xvc2luZ1RvcEFuZEJvdHRv bS5ib3R0b20sIGJvcmRlckJveC5ib3R0b20oKSk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJu IElubGluZURpc3BsYXk6OkxpbmUgeyBsaW5lQm94TG9naWNhbFJlY3QsIHNjcm9sbGFibGVPdmVy Zmxvd1JlY3QsIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgcm9vdElubGluZUJveC5sb2dpY2FsVG9w KCkgKyByb290SW5saW5lQm94LmJhc2VsaW5lKCksIHJvb3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZz ZXQgKyByb290SW5saW5lQm94LmxvZ2ljYWxMZWZ0KCksIHJvb3RJbmxpbmVCb3gubG9naWNhbFdp ZHRoKCkgfTsKKyAgICAgICAgcmV0dXJuIElubGluZURpc3BsYXk6OkxpbmUgeyBsaW5lQm94UmVj dCwgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLCByb290SW5s aW5lQm94LmxvZ2ljYWxUb3AoKSArIHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKSwgcm9vdElubGlu ZUJveEFsaWdubWVudE9mZnNldCArIHJvb3RJbmxpbmVCb3gubG9naWNhbExlZnQoKSwgcm9vdElu bGluZUJveC5sb2dpY2FsV2lkdGgoKSB9OwogICAgIH07CiAgICAgcmV0dXJuIHsgbGluZSgpLCBs aW5lQm94IH07CiB9CkBAIC0zMDcsNyArMzA3LDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94 QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmUK ICAgICAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0 dGluZ1N0YXRlID0gbGF5b3V0U3RhdGUoKS5mb3JtYXR0aW5nU3RhdGVGb3JJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dChkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCkpOwogICAgICAgICAg ICAgICAgICAgICBhdXRvJiBsYXN0TGluZSA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLmxhc3Qo KTsKLSAgICAgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCbG9ja0Jhc2VsaW5lID0gbGFzdExp bmUubGluZUJveExvZ2ljYWxSZWN0KCkudG9wKCkgKyBsYXN0TGluZS5iYXNlbGluZSgpOworICAg ICAgICAgICAgICAgICAgICBhdXRvIGlubGluZUJsb2NrQmFzZWxpbmUgPSBsYXN0TGluZS5saW5l Qm94UmVjdCgpLnRvcCgpICsgbGFzdExpbmUuYmFzZWxpbmUoKTsKICAgICAgICAgICAgICAgICAg ICAgYXNjZW50ID0gaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSArIGlubGlu ZUxldmVsQm94R2VvbWV0cnkuYm9yZGVyQmVmb3JlKCkgKyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5 LnBhZGRpbmdCZWZvcmUoKS52YWx1ZV9vcigwKSArIGlubGluZUJsb2NrQmFzZWxpbmU7CiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIGlmIChsYXlvdXRCb3guaXNSZXBsYWNl ZEJveCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGlu ZS5oCmluZGV4IGU0NzdhMzUxMzMzNDEwZDVjODI0OTFjODM1NTcyMjEwZTk4MjUwNTkuLjY1NTcw YjlhOGY1N2YyN2ZhY2MzYjM5OGFmYjk5ZjM0NTBiNzg2YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlz cGxheUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmgKQEAgLTQwLDQwICs0MCw0MCBAQCBw dWJsaWM6CiAgICAgICAgIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCB0b3AgeyAwIH07CiAgICAg ICAgIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBib3R0b20geyAwIH07CiAgICAgfTsKLSAgICBM aW5lKGNvbnN0IExheW91dDo6SW5saW5lUmVjdCYgbGluZUJveExvZ2ljYWxSZWN0LCBjb25zdCBM YXlvdXQ6OklubGluZVJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgRW5jbG9zaW5nVG9wQW5kQm90 dG9tLCBMYXlvdXQ6OklubGluZUxheW91dFVuaXQgYWxpZ21lbnRCYXNlbGluZSwgTGF5b3V0OjpJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgTGF5b3V0OjpJbmxpbmVMYXlvdXRV bml0IGNvbnRlbnRMb2dpY2FsV2lkdGgpOworICAgIExpbmUoY29uc3QgTGF5b3V0OjpJbmxpbmVS ZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBzY3JvbGxhYmxlT3Zl cmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGFs aWdtZW50QmFzZWxpbmUsIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBjb250ZW50TGVmdCwgTGF5 b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRXaWR0aCk7CiAKLSAgICBjb25zdCBMYXlvdXQ6 OklubGluZVJlY3QmIGxpbmVCb3hMb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJv eExvZ2ljYWxSZWN0OyB9CisgICAgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBsaW5lQm94UmVj dCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3Q7IH0KICAgICBjb25zdCBMYXlvdXQ6Oklu bGluZVJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYWJs ZU92ZXJmbG93OyB9CiAKICAgICBFbmNsb3NpbmdUb3BBbmRCb3R0b20gZW5jbG9zaW5nVG9wQW5k Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b207IH0KIAogICAg IExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWxp Z21lbnRCYXNlbGluZTsgfQogCi0gICAgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRM b2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxMZWZ0OyB9Ci0gICAg TGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJl dHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KKyAgICBMYXlvdXQ6OklubGluZUxheW91dFVu aXQgY29udGVudExlZnQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0OyB9CisgICAgTGF5 b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29u dGVudFdpZHRoOyB9CiAKLSAgICB2b2lkIG1vdmVWZXJ0aWNhbGx5KExheW91dDo6SW5saW5lTGF5 b3V0VW5pdCBvZmZzZXQpIHsgbV9saW5lQm94TG9naWNhbFJlY3QubW92ZVZlcnRpY2FsbHkob2Zm c2V0KTsgfQorICAgIHZvaWQgbW92ZVZlcnRpY2FsbHkoTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0 IG9mZnNldCkgeyBtX2xpbmVCb3hSZWN0Lm1vdmVWZXJ0aWNhbGx5KG9mZnNldCk7IH0KIAogcHJp dmF0ZToKICAgICAvLyBUaGlzIGlzIGxpbmUgYm94IGdlb21ldHJ5IChzZWUgaHR0cHM6Ly93d3cu dzMub3JnL1RSL2Nzcy1pbmxpbmUtMy8jbGluZS1ib3gpLgotICAgIExheW91dDo6SW5saW5lUmVj dCBtX2xpbmVCb3hMb2dpY2FsUmVjdDsKKyAgICBMYXlvdXQ6OklubGluZVJlY3QgbV9saW5lQm94 UmVjdDsKICAgICBMYXlvdXQ6OklubGluZVJlY3QgbV9zY3JvbGxhYmxlT3ZlcmZsb3c7CiAgICAg Ly8gRW5jbG9zaW5nIHRvcCBhbmQgYm90dG9tIGluY2x1ZGVzIGFsbCBpbmxpbmUgbGV2ZWwgYm94 ZXMgKGJvcmRlciBib3gpIHZlcnRpY2FsbHkuCiAgICAgLy8gV2hpbGUgdGhlIGxpbmUgYm94IHVz dWFsbHkgZW5jbG9zZSB0aGVtIGFzIHdlbGwsIGl0cyB2ZXJ0aWNhbCBnZW9tZXRyeSBpcyBiYXNl ZCBvbgogICAgIC8vIHRoZSBsYXlvdXQgYm91bmRzIG9mIHRoZSBpbmxpbmUgbGV2ZWwgYm94ZXMg d2hpY2ggbWF5IGJlIGRpZmZlcmVudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIHByZXNlbnQuCiAgICAg RW5jbG9zaW5nVG9wQW5kQm90dG9tIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tOwogICAgIExheW91 dDo6SW5saW5lTGF5b3V0VW5pdCBtX2FsaWdtZW50QmFzZWxpbmUgeyAwIH07Ci0gICAgTGF5b3V0 OjpJbmxpbmVMYXlvdXRVbml0IG1fY29udGVudExvZ2ljYWxMZWZ0IHsgMCB9OwotICAgIExheW91 dDo6SW5saW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CisgICAgTGF5 b3V0OjpJbmxpbmVMYXlvdXRVbml0IG1fY29udGVudExlZnQgeyAwIH07CisgICAgTGF5b3V0OjpJ bmxpbmVMYXlvdXRVbml0IG1fY29udGVudFdpZHRoIHsgMCB9OwogfTsKIAotaW5saW5lIExpbmU6 OkxpbmUoY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBsaW5lQm94TG9naWNhbFJlY3QsIGNvbnN0 IExheW91dDo6SW5saW5lUmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3NpbmdUb3BBbmRC b3R0b20gZW5jbG9zaW5nVG9wQW5kQm90dG9tLCBMYXlvdXQ6OklubGluZUxheW91dFVuaXQgYWxp Z21lbnRCYXNlbGluZSwgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVm dCwgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgpCi0gICAgOiBt X2xpbmVCb3hMb2dpY2FsUmVjdChsaW5lQm94TG9naWNhbFJlY3QpCitpbmxpbmUgTGluZTo6TGlu ZShjb25zdCBMYXlvdXQ6OklubGluZVJlY3QmIGxpbmVCb3hSZWN0LCBjb25zdCBMYXlvdXQ6Oklu bGluZVJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgRW5jbG9zaW5nVG9wQW5kQm90dG9tIGVuY2xv c2luZ1RvcEFuZEJvdHRvbSwgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGFsaWdtZW50QmFzZWxp bmUsIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBjb250ZW50TGVmdCwgTGF5b3V0OjpJbmxpbmVM YXlvdXRVbml0IGNvbnRlbnRXaWR0aCkKKyAgICA6IG1fbGluZUJveFJlY3QobGluZUJveFJlY3Qp CiAgICAgLCBtX3Njcm9sbGFibGVPdmVyZmxvdyhzY3JvbGxhYmxlT3ZlcmZsb3cpCiAgICAgLCBt X2VuY2xvc2luZ1RvcEFuZEJvdHRvbShlbmNsb3NpbmdUb3BBbmRCb3R0b20pCiAgICAgLCBtX2Fs aWdtZW50QmFzZWxpbmUoYWxpZ21lbnRCYXNlbGluZSkKLSAgICAsIG1fY29udGVudExvZ2ljYWxM ZWZ0KGNvbnRlbnRMb2dpY2FsTGVmdCkKLSAgICAsIG1fY29udGVudExvZ2ljYWxXaWR0aChjb250 ZW50TG9naWNhbFdpZHRoKQorICAgICwgbV9jb250ZW50TGVmdChjb250ZW50TGVmdCkKKyAgICAs IG1fY29udGVudFdpZHRoKGNvbnRlbnRXaWR0aCkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVu dEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCmluZGV4IDg0YzhmODJjYjhkMTMyMzgw MjE0NTg0MDIzYjE5NDkzZDU0MDczNzMuLmZiNGU3ZDQ0NzY0YjE3OTJkYjRmZmVkMGNlOTMwNmM2 MTQ0OGE5YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVp bGRlci5jcHAKQEAgLTQ2LDcgKzQ2LDcgQEAgaW5saW5lIElubGluZURpc3BsYXk6OkxpbmU6OkVu Y2xvc2luZ1RvcEFuZEJvdHRvbSBvcGVyYXRvcisoY29uc3QgSW5saW5lRGlzcGxheToKICAgICBy ZXR1cm4geyBlbmNsb3NpbmdUb3BBbmRCb3R0b20udG9wICsgb2Zmc2V0LCBlbmNsb3NpbmdUb3BB bmRCb3R0b20uYm90dG9tICsgb2Zmc2V0IH07CiB9CiAKLWlubGluZSBzdGF0aWMgZmxvYXQgbGlu ZU92ZXJmbG93V2lkdGgoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBMYXlvdXQ6OklubGlu ZUxheW91dFVuaXQgbGluZUNvbnRlbnRMb2dpY2FsV2lkdGgpCitpbmxpbmUgc3RhdGljIGZsb2F0 IGxpbmVPdmVyZmxvd1dpZHRoKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgTGF5b3V0OjpJ bmxpbmVMYXlvdXRVbml0IGxpbmVDb250ZW50V2lkdGgpCiB7CiAgICAgLy8gRklYTUU6IEl0J3Mg dGhlIGNvcHkgb2YgdGhlIGxldHMtYWRqdXN0LW92ZXJmbG93LWZvci10aGUtY2FyZXQgYmVoYXZp b3IgZnJvbSBMZWdhY3lMaW5lTGF5b3V0OjphZGRPdmVyZmxvd0Zyb21JbmxpbmVDaGlsZHJlbi4K ICAgICBhdXRvIGVuZFBhZGRpbmcgPSBmbG93Lmhhc05vblZpc2libGVPdmVyZmxvdygpID8gZmxv dy5wYWRkaW5nRW5kKCkgOiAwX2x1OwpAQCAtNTQsNyArNTQsNyBAQCBpbmxpbmUgc3RhdGljIGZs b2F0IGxpbmVPdmVyZmxvd1dpZHRoKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgTGF5b3V0 OjpJbmxpbgogICAgICAgICBlbmRQYWRkaW5nID0gZmxvdy5lbmRQYWRkaW5nV2lkdGhGb3JDYXJl dCgpOwogICAgIGlmIChmbG93Lmhhc05vblZpc2libGVPdmVyZmxvdygpICYmICFlbmRQYWRkaW5n ICYmIGZsb3cuZWxlbWVudCgpICYmIGZsb3cuZWxlbWVudCgpLT5pc1Jvb3RFZGl0YWJsZUVsZW1l bnQoKSkKICAgICAgICAgZW5kUGFkZGluZyA9IDE7Ci0gICAgcmV0dXJuIGxpbmVDb250ZW50TG9n aWNhbFdpZHRoICsgZW5kUGFkZGluZzsKKyAgICByZXR1cm4gbGluZUNvbnRlbnRXaWR0aCArIGVu ZFBhZGRpbmc7CiB9CiAKIElubGluZUNvbnRlbnRCdWlsZGVyOjpJbmxpbmVDb250ZW50QnVpbGRl cihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGJsb2NrRmxvdywgY29uc3QgQm94VHJlZSYgYm94VHJl ZSkKQEAgLTc5LDcgKzc5LDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlz cGxheUxpbmVzKExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICBmb3IgKHNp emVfdCBsaW5lSW5kZXggPSAwOyBsaW5lSW5kZXggPCBsaW5lcy5zaXplKCk7ICsrbGluZUluZGV4 KSB7CiAgICAgICAgIGF1dG8mIGxpbmUgPSBsaW5lc1tsaW5lSW5kZXhdOwogICAgICAgICBhdXRv IHNjcm9sbGFibGVPdmVyZmxvd1JlY3QgPSBGbG9hdFJlY3QgeyBsaW5lLnNjcm9sbGFibGVPdmVy ZmxvdygpIH07Ci0gICAgICAgIGlmIChhdXRvIG92ZXJmbG93V2lkdGggPSBsaW5lT3ZlcmZsb3dX aWR0aChtX2Jsb2NrRmxvdywgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkpOyBvdmVyZmxvd1dp ZHRoID4gc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC53aWR0aCgpKQorICAgICAgICBpZiAoYXV0byBv dmVyZmxvd1dpZHRoID0gbGluZU92ZXJmbG93V2lkdGgobV9ibG9ja0Zsb3csIGxpbmUuY29udGVu dFdpZHRoKCkpOyBvdmVyZmxvd1dpZHRoID4gc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC53aWR0aCgp KQogICAgICAgICAgICAgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC5zZXRXaWR0aChvdmVyZmxvd1dp ZHRoKTsKIAogICAgICAgICBhdXRvIGZpcnN0Qm94SW5kZXggPSBib3hJbmRleDsKQEAgLTExMiw5 ICsxMTIsOCBAQCB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMo TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubAogICAgICAgICAgICAgICAgIGlubGlu ZUNvbnRlbnQuaGFzTXVsdGlsaW5lUGFpbnRPdmVybGFwID0gdHJ1ZTsKICAgICAgICAgfQogCi0g ICAgICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gRmxvYXRSZWN0IHsgbGluZS5saW5lQm94 TG9naWNhbFJlY3QoKSB9OwogICAgICAgICBhdXRvIGJveENvdW50ID0gYm94SW5kZXggLSBmaXJz dEJveEluZGV4OwotICAgICAgICBpbmxpbmVDb250ZW50LmxpbmVzLmFwcGVuZCh7IGZpcnN0Qm94 SW5kZXgsIGJveENvdW50LCBsaW5lQm94TG9naWNhbFJlY3QsIGxpbmUuZW5jbG9zaW5nVG9wQW5k Qm90dG9tKCkudG9wLCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpLmJvdHRvbSwgc2Nyb2xs YWJsZU92ZXJmbG93UmVjdCwgbGluZUlua092ZXJmbG93UmVjdCwgbGluZS5iYXNlbGluZSgpLCBs aW5lLmNvbnRlbnRMb2dpY2FsTGVmdCgpLCBsaW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKSB9KTsK KyAgICAgICAgaW5saW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBmaXJzdEJveEluZGV4LCBib3hD b3VudCwgeyBsaW5lLmxpbmVCb3hSZWN0KCkgfSwgbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20o KS50b3AsIGxpbmUuZW5jbG9zaW5nVG9wQW5kQm90dG9tKCkuYm90dG9tLCBzY3JvbGxhYmxlT3Zl cmZsb3dSZWN0LCBsaW5lSW5rT3ZlcmZsb3dSZWN0LCBsaW5lLmJhc2VsaW5lKCksIGxpbmUuY29u dGVudExlZnQoKSwgbGluZS5jb250ZW50V2lkdGgoKSB9KTsKICAgICB9CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNw cAppbmRleCA4YmYzMmU1OTNmMzdjNDk4MjJjMWM5NWE3OGZjNzZkODA2ZDc5YjA1Li41NjA4OGEw MzlmYTY2YzExM2Y2MjEzOWRiMjAzZTI3N2UzNjU3ZmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCkBAIC0zNzQs OSArMzc0LDkgQEAgdm9pZCBzaG93SW5saW5lVHJlZUFuZFJ1bnMoVGV4dFN0cmVhbSYgc3RyZWFt LCBjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGMKICAgICAgICAgfTsKICAgICAgICAg YWRkU3BhY2luZygpOwogICAgICAgICBhdXRvJiBsaW5lID0gbGluZXNbbGluZUluZGV4XTsKLSAg ICAgICAgYXV0byYgbGluZUJveExvZ2ljYWxSZWN0ID0gbGluZS5saW5lQm94TG9naWNhbFJlY3Qo KTsKKyAgICAgICAgYXV0byYgbGluZUJveFJlY3QgPSBsaW5lLmxpbmVCb3hSZWN0KCk7CiAgICAg ICAgIGF1dG8gZW5jbG9zaW5nVG9wQW5kQm90dG9tID0gbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0 b20oKTsKLSAgICAgICAgc3RyZWFtIDw8ICJsaW5lIGF0ICgiIDw8IGxpbmVCb3hMb2dpY2FsUmVj dC5sZWZ0KCkgPDwgIiwiIDw8IGxpbmVCb3hMb2dpY2FsUmVjdC50b3AoKSA8PCAiKSBzaXplICgi IDw8IGxpbmVCb3hMb2dpY2FsUmVjdC53aWR0aCgpIDw8ICJ4IiA8PCBsaW5lQm94TG9naWNhbFJl Y3QuaGVpZ2h0KCkgPDwgIikgYmFzZWxpbmUgKCIgPDwgbGluZS5iYXNlbGluZSgpIDw8ICIpIGVu Y2xvc2luZyB0b3AgKCIgPDwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLnRvcCA8PCAiKSBib3R0b20g KCIgPDwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLmJvdHRvbSA8PCAiKSI7CisgICAgICAgIHN0cmVh bSA8PCAibGluZSBhdCAoIiA8PCBsaW5lQm94UmVjdC5sZWZ0KCkgPDwgIiwiIDw8IGxpbmVCb3hS ZWN0LnRvcCgpIDw8ICIpIHNpemUgKCIgPDwgbGluZUJveFJlY3Qud2lkdGgoKSA8PCAieCIgPDwg bGluZUJveFJlY3QuaGVpZ2h0KCkgPDwgIikgYmFzZWxpbmUgKCIgPDwgbGluZS5iYXNlbGluZSgp IDw8ICIpIGVuY2xvc2luZyB0b3AgKCIgPDwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLnRvcCA8PCAi KSBib3R0b20gKCIgPDwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLmJvdHRvbSA8PCAiKSI7CiAgICAg ICAgIHN0cmVhbS5uZXh0TGluZSgpOwogCiAgICAgICAgIGFkZFNwYWNpbmcoKTsK 447578 2021-12-19 20:57:26 -0800 2021-12-20 07:13:02 -0800 Patch bug-234490-20211219205725.patch text/plain 19997 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTExOGMxMzk1Nzc4Nzkw M2IyNjE2MWU1OTJmZGJiMTc2YzU1ZmZjYS4uYWE2MjQ3ZTk4YTZiNmYwMTY5YWJjOWZmYTYzM2Fk NTg2OTlhNjQ2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTEyLTE5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIElubGluZURp c3BsYXk6OkxpbmUgaGFzIHBoeXNpY2FsIGdlb21ldHJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ0OTAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdGhlIHRlcm0gImxvZ2ljYWwiIGZyb20g ZnVuY3Rpb24gbmFtZXMgYW5kIHZhcmlhYmxlcy4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvYmxvY2svQmxvY2tGb3JtYXR0aW5nR2VvbWV0cnkuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFj ZWRDb250ZW50SGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojp1c2VkQ29udGVudEhl aWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9t ZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMpOgorICAgICAg ICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmxpbmVCb3hS ZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmNvbnRl bnRMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmNv bnRlbnRXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpMaW5l Ojptb3ZlVmVydGljYWxseSk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpMaW5l OjpMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OmxpbmVCb3hM b2dpY2FsUmVjdCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNw bGF5OjpMaW5lOjpjb250ZW50TG9naWNhbExlZnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6SW5saW5lRGlzcGxheTo6TGluZTo6Y29udGVudExvZ2ljYWxXaWR0aCBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OmxpbmVPdmVyZmxvd1dpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVn cmF0aW9uOjpJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzIGNvbnN0KToK KyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OnNob3dJbmxpbmVUcmVlQW5kUnVucyk6CisKIDIwMjEtMTIt MTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgTWlu b3IgY2xlYW51cCBpbiBhaXNsZSBFdmVudEhhbmRsZXI6OmhhbmRsZVdoZWVsRXZlbnRJbkFwcHJv cHJpYXRlRW5jbG9zaW5nQm94KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvYmxvY2svQmxvY2tGb3JtYXR0aW5nR2VvbWV0cnkuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9ibG9jay9CbG9ja0Zvcm1hdHRp bmdHZW9tZXRyeS5jcHAKaW5kZXggYjFhNTdmYjdlYWYzNzQ1MmViMTQ3YTI2NDkxYjBiYTY0NzE0 ZDdjMi4uYjQyYzNlMTM4M2Q4MzUyZGYzMzFjNmIwM2RiNGJiMzkxZGMxODYwZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9ibG9jay9CbG9ja0Zv cm1hdHRpbmdHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9ibG9jay9CbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeS5jcHAKQEAgLTg3LDcgKzg3 LDcgQEAgQ29udGVudEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeTo6aW5G bG93Tm9uUmVwbGFjZWRDb250ZW50SGVpZ2h0QW4KICAgICAgICAgICAgIGF1dG8mIGxpbmVzID0g aW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVzKCk7CiAgICAgICAgICAgICAvLyBFdmVuIGVtcHR5 IGNvbnRhaW5lcnMgZ2VuZXJhdGUgb25lIGxpbmUuIAogICAgICAgICAgICAgQVNTRVJUKCFsaW5l cy5pc0VtcHR5KCkpOwotICAgICAgICAgICAgcmV0dXJuIHsgdG9MYXlvdXRVbml0KGxpbmVzLmxh c3QoKS5saW5lQm94TG9naWNhbFJlY3QoKS5ib3R0b20oKSArIGlubGluZUZvcm1hdHRpbmdTdGF0 ZS5jbGVhckdhcEFmdGVyTGFzdExpbmUoKSkgLSBib3JkZXJBbmRQYWRkaW5nVG9wLCBub25Db2xs YXBzZWRNYXJnaW4gfTsKKyAgICAgICAgICAgIHJldHVybiB7IHRvTGF5b3V0VW5pdChsaW5lcy5s YXN0KCkubGluZUJveFJlY3QoKS5ib3R0b20oKSArIGlubGluZUZvcm1hdHRpbmdTdGF0ZS5jbGVh ckdhcEFmdGVyTGFzdExpbmUoKSkgLSBib3JkZXJBbmRQYWRkaW5nVG9wLCBub25Db2xsYXBzZWRN YXJnaW4gfTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIDIuIHRoZSBib3R0b20gZWRnZSBvZiB0 aGUgYm90dG9tIChwb3NzaWJseSBjb2xsYXBzZWQpIG1hcmdpbiBvZiBpdHMgbGFzdCBpbi1mbG93 IGNoaWxkLCBpZiB0aGUgY2hpbGQncyBib3R0b20gbWFyZ2luLi4uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZjM2NmIyMjc3ZTgxNDIx MDRmZmQ5YzcxMDA5N2MzMDc5YzEyMWUzNi4uOWUzMDcyMjFmZmE4NmUzMjNlNDFkYjlkYzA1NGU5 YWI2NTlhMzZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtMTg1LDggKzE4NSw4IEBAIExheW91dFVuaXQgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OnVzZWRDb250ZW50SGVpZ2h0KCkgY29uc3QKICAgICBhdXRvJiBsaW5lcyA9IGZv cm1hdHRpbmdTdGF0ZSgpLmxpbmVzKCk7CiAgICAgLy8gRXZlbiBlbXB0eSBjb250ZW50IGdlbmVy YXRlcyBhIGxpbmUuCiAgICAgQVNTRVJUKCFsaW5lcy5pc0VtcHR5KCkpOwotICAgIGF1dG8gdG9w ID0gTGF5b3V0VW5pdCB7IGxpbmVzLmZpcnN0KCkubGluZUJveExvZ2ljYWxSZWN0KCkudG9wKCkg fTsKLSAgICBhdXRvIGJvdHRvbSA9IExheW91dFVuaXQgeyBsaW5lcy5sYXN0KCkubGluZUJveExv Z2ljYWxSZWN0KCkuYm90dG9tKCkgKyBmb3JtYXR0aW5nU3RhdGUoKS5jbGVhckdhcEFmdGVyTGFz dExpbmUoKSB9OworICAgIGF1dG8gdG9wID0gTGF5b3V0VW5pdCB7IGxpbmVzLmZpcnN0KCkubGlu ZUJveFJlY3QoKS50b3AoKSB9OworICAgIGF1dG8gYm90dG9tID0gTGF5b3V0VW5pdCB7IGxpbmVz Lmxhc3QoKS5saW5lQm94UmVjdCgpLmJvdHRvbSgpICsgZm9ybWF0dGluZ1N0YXRlKCkuY2xlYXJH YXBBZnRlckxhc3RMaW5lKCkgfTsKIAogICAgIGF1dG8gZmxvYXRpbmdDb250ZXh0ID0gRmxvYXRp bmdDb250ZXh0IHsgKnRoaXMsIGZvcm1hdHRpbmdTdGF0ZSgpLmZsb2F0aW5nU3RhdGUoKSB9Owog ICAgIGlmIChhdXRvIGZsb2F0Qm90dG9tID0gZmxvYXRpbmdDb250ZXh0LmJvdHRvbSgpKSB7CkBA IC0zMDUsNyArMzA1LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0 YXRpY1Bvc2l0aW9uRm9yT3V0T2ZGbG93Q29udGVudChjb25zdCBGb3IKICAgICAgICAgICAgIC8v IFRoaXMgaXMgdGhlIGZpcnN0IChub24tZmxvYXQpY2hpbGQuIExldCdzIHBsYWNlIGl0IHRvIHRo ZSBsZWZ0IG9mIHRoZSBmaXJzdCBib3guCiAgICAgICAgICAgICAvLyA8ZGl2PjxpbWcgc3R5bGU9 InBvc2l0aW9uOiBhYnNvbHV0ZSI+dGV4dCBjb250ZW50PC9kaXY+CiAgICAgICAgICAgICBBU1NF UlQoYm94ZXMuc2l6ZSgpKTsKLSAgICAgICAgICAgIG91dE9mRmxvd0dlb21ldHJ5LnNldExvZ2lj YWxUb3BMZWZ0KHsgYm94ZXNbMF0ubGVmdCgpLCBsaW5lc1swXS5saW5lQm94TG9naWNhbFJlY3Qo KS50b3AoKSB9KTsKKyAgICAgICAgICAgIG91dE9mRmxvd0dlb21ldHJ5LnNldExvZ2ljYWxUb3BM ZWZ0KHsgYm94ZXNbMF0ubGVmdCgpLCBsaW5lc1swXS5saW5lQm94UmVjdCgpLnRvcCgpIH0pOwog ICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIApAQCAtMzQ2LDE4ICszNDYsMTggQEAg dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY1Bvc2l0aW9uRm9yT3V0 T2ZGbG93Q29udGVudChjb25zdCBGb3IKICAgICAgICAgICAgICAgICAgICAgICAgID8gQm94R2Vv bWV0cnk6OmJvcmRlckJveExlZnQoaW5saW5lQm94Qm94R2VvbWV0cnkpICsgaW5saW5lQm94Qm94 R2VvbWV0cnkuY29udGVudEJveExlZnQoKQogICAgICAgICAgICAgICAgICAgICAgICAgOiBCb3hH ZW9tZXRyeTo6Ym9yZGVyQm94UmVjdChpbmxpbmVCb3hCb3hHZW9tZXRyeSkucmlnaHQoKTsKICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0cnkuc2V0TG9n aWNhbFRvcExlZnQoeyBsZWZ0LCBsaW5lc1twcmV2aW91c0JveC5saW5lSW5kZXgoKV0ubGluZUJv eExvZ2ljYWxSZWN0KCkudG9wKCkgfSk7CisgICAgICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0 cnkuc2V0TG9naWNhbFRvcExlZnQoeyBsZWZ0LCBsaW5lc1twcmV2aW91c0JveC5saW5lSW5kZXgo KV0ubGluZUJveFJlY3QoKS50b3AoKSB9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChuZXh0Qm94KSB7CiAgICAgICAgICAgICAgICAg Ly8gVGhlIG91dCBvZiBmbG93IGJveCBpcyBwbGFjZWQgYXQgdGhlIGJlZ2lubmluZyBvZiB0aGUg bmV4dCBsaW5lICh3aGVyZSB0aGUgZmlyc3QgYm94IG9uIHRoZSBsaW5lIGlzKS4KICAgICAgICAg ICAgICAgICAvLyA8ZGl2PnRleHQ8YnI+PGltZyBzdHlsZT0icG9zaXRpb246IGFic29sdXRlIj48 aW1nIHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGUiPmNvbnRlbnQ8L2Rpdj4KLSAgICAgICAgICAg ICAgICBvdXRPZkZsb3dHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh7IG5leHRCb3gtPmxlZnQo KSwgbGluZXNbbmV4dEJveC0+bGluZUluZGV4KCldLmxpbmVCb3hMb2dpY2FsUmVjdCgpLnRvcCgp IH0pOworICAgICAgICAgICAgICAgIG91dE9mRmxvd0dlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0 KHsgbmV4dEJveC0+bGVmdCgpLCBsaW5lc1tuZXh0Qm94LT5saW5lSW5kZXgoKV0ubGluZUJveFJl Y3QoKS50b3AoKSB9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgIGF1dG8mIGxhc3RMaW5lTG9naWNhbFJlY3QgPSBsaW5lc1twcmV2aW91c0Jv eC5saW5lSW5kZXgoKV0ubGluZUJveExvZ2ljYWxSZWN0KCk7CisgICAgICAgICAgICBhdXRvJiBs YXN0TGluZUxvZ2ljYWxSZWN0ID0gbGluZXNbcHJldmlvdXNCb3gubGluZUluZGV4KCldLmxpbmVC b3hSZWN0KCk7CiAgICAgICAgICAgICAvLyBUaGlzIG91dC1vZi1mbG93IGJveCBpcyB0aGUgbGFz dCBib3guCiAgICAgICAgICAgICAvLyBGSVhNRTogVXNlIGlzTGluZUJyZWFrIGluc3RlYWQgdG8g Y292ZXIgcHJlc2VydmVkIG5ldyBsaW5lcyB0b28uCiAgICAgICAgICAgICBpZiAocHJldmlvdXNC b3gubGF5b3V0Qm94KCkuaXNMaW5lQnJlYWtCb3goKSkgewpAQCAtNTUyLDcgKzU1Miw3IEBAIElu bGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVD b250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgYXV0byBjdXJyZW50TGluZUluZGV4ID0gZm9ybWF0 dGluZ1N0YXRlLmxpbmVzKCkuc2l6ZSgpOwogCiAgICAgYXV0byBsaW5lQW5kTGluZUJveCA9IExp bmVCb3hCdWlsZGVyKCp0aGlzKS5idWlsZChsaW5lQ29udGVudCwgY3VycmVudExpbmVJbmRleCk7 Ci0gICAgYXV0byBsaW5lQm94TG9naWNhbFJlY3QgPSBsaW5lQW5kTGluZUJveC5saW5lLmxpbmVC b3hMb2dpY2FsUmVjdCgpOworICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gbGluZUFuZExp bmVCb3gubGluZS5saW5lQm94UmVjdCgpOwogCiAgICAgYXV0byBpbmxpbmVDb250ZW50QnVpbGRl ciA9IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlciB7IHJvb3QoKSwgZm9ybWF0dGluZ1N0YXRl IH07CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZEJveGVzKGlubGluZUNvbnRlbnRCdWlsZGVyLmJ1 aWxkKGxpbmVDb250ZW50LCBsaW5lQW5kTGluZUJveC5saW5lQm94LCBsaW5lQm94TG9naWNhbFJl Y3QsIGN1cnJlbnRMaW5lSW5kZXgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC b3hCdWlsZGVyLmNwcAppbmRleCBjNjQ4YTE1NzMzNTU4NjUxZmUxYWRlZDdmYjQwZWQzNzVhMmJl NmI3Li4wMDA4MzkxNDA3MmJiMmUwM2MzMWViOWM4ZDk1ODNkZDE1YWE4OTBiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lQm94QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCkBAIC0xMTksMTAgKzExOSwx MCBAQCBMaW5lQm94QnVpbGRlcjo6TGluZUFuZExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxk KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgICAgICAgICAgcGh5c2ljYWxMZWZ0IC09 IGxpbmVDb250ZW50LmxpbmVNYXJnaW5TdGFydDsKICAgICAgICAgfQogICAgICAgICAvLyBGSVhN RTogVXNlIHBoeXNpY2FsIGdlb21ldHJ5IGhlcmUuCi0gICAgICAgIGF1dG8gbGluZUJveExvZ2lj YWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsVG9wTGVmdC55KCks IHBoeXNpY2FsTGVmdCwgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aCwgbGluZUJveExvZ2lj YWxIZWlnaHQgfTsKLSAgICAgICAgYXV0byBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0ID0gbGluZUJv eExvZ2ljYWxSZWN0OworICAgICAgICBhdXRvIGxpbmVCb3hSZWN0ID0gSW5saW5lUmVjdCB7IGxp bmVDb250ZW50LmxpbmVMb2dpY2FsVG9wTGVmdC55KCksIHBoeXNpY2FsTGVmdCwgbGluZUNvbnRl bnQubGluZUxvZ2ljYWxXaWR0aCwgbGluZUJveExvZ2ljYWxIZWlnaHQgfTsKKyAgICAgICAgYXV0 byBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0ID0gbGluZUJveFJlY3Q7CiAgICAgICAgIGF1dG8mIHJv b3RJbmxpbmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKLSAgICAgICAgYXV0byBlbmNs b3NpbmdUb3BBbmRCb3R0b20gPSBJbmxpbmVEaXNwbGF5OjpMaW5lOjpFbmNsb3NpbmdUb3BBbmRC b3R0b20geyBsaW5lQm94TG9naWNhbFJlY3QudG9wKCkgKyByb290SW5saW5lQm94LmxvZ2ljYWxU b3AoKSwgbGluZUJveExvZ2ljYWxSZWN0LnRvcCgpICsgcm9vdElubGluZUJveC5sb2dpY2FsQm90 dG9tKCkgfTsKKyAgICAgICAgYXV0byBlbmNsb3NpbmdUb3BBbmRCb3R0b20gPSBJbmxpbmVEaXNw bGF5OjpMaW5lOjpFbmNsb3NpbmdUb3BBbmRCb3R0b20geyBsaW5lQm94UmVjdC50b3AoKSArIHJv b3RJbmxpbmVCb3gubG9naWNhbFRvcCgpLCBsaW5lQm94UmVjdC50b3AoKSArIHJvb3RJbmxpbmVC b3gubG9naWNhbEJvdHRvbSgpIH07CiAKICAgICAgICAgZm9yIChhdXRvJiBpbmxpbmVMZXZlbEJv eCA6IGxpbmVCb3gubm9uUm9vdElubGluZUxldmVsQm94ZXMoKSkgewogICAgICAgICAgICAgaWYg KCFpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkgJiYgIWlubGluZUxldmVs Qm94LmlzSW5saW5lQm94KCkpCkBAIC0xMzMsMTEgKzEzMywxMSBAQCBMaW5lQm94QnVpbGRlcjo6 TGluZUFuZExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpM aW5lQ29udAogCiAgICAgICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxpbmVM ZXZlbEJveCgpKSB7CiAgICAgICAgICAgICAgICAgYm9yZGVyQm94ID0gbGluZUJveC5sb2dpY2Fs Qm9yZGVyQm94Rm9yQXRvbWljSW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBmb3JtYXR0aW5nQ29u dGV4dCgpLmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCkpOwotICAgICAgICAgICAgICAgIGJvcmRl ckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSk7CisgICAgICAgICAgICAg ICAgYm9yZGVyQm94Lm1vdmVCeShsaW5lQm94UmVjdC50b3BMZWZ0KCkpOwogICAgICAgICAgICAg fSBlbHNlIGlmIChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpKSB7CiAgICAgICAgICAgICAg ICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94 KGxheW91dEJveCk7CiAgICAgICAgICAgICAgICAgYm9yZGVyQm94ID0gbGluZUJveC5sb2dpY2Fs Qm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAgICAg ICAgICAgIGJvcmRlckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSk7Cisg ICAgICAgICAgICAgICAgYm9yZGVyQm94Lm1vdmVCeShsaW5lQm94UmVjdC50b3BMZWZ0KCkpOwog ICAgICAgICAgICAgICAgIC8vIENvbGxlY3Qgc2Nyb2xsYWJsZSBvdmVyZmxvdyBmcm9tIGlubGlu ZSBib3hlcy4gQWxsIG90aGVyIGlubGluZSBsZXZlbCBib3hlcyAoZS5nIGF0b21pYyBpbmxpbmUg bGV2ZWwgYm94ZXMpIHN0cmV0Y2ggdGhlIGxpbmUuCiAgICAgICAgICAgICAgICAgYXV0byBoYXNT Y3JvbGxhYmxlQ29udGVudCA9IFsmXSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIEluIHN0YW5k YXJkcyBtb2RlLCBpbmxpbmUgYm94ZXMgYWx3YXlzIHN0YXJ0IHdpdGggYW4gaW1hZ2luYXJ5IHN0 cnV0LgpAQCAtMTUzLDcgKzE1Myw3IEBAIExpbmVCb3hCdWlsZGVyOjpMaW5lQW5kTGluZUJveCBM aW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAg ICAgICBlbmNsb3NpbmdUb3BBbmRCb3R0b20udG9wID0gc3RkOjptaW4oZW5jbG9zaW5nVG9wQW5k Qm90dG9tLnRvcCwgYm9yZGVyQm94LnRvcCgpKTsKICAgICAgICAgICAgIGVuY2xvc2luZ1RvcEFu ZEJvdHRvbS5ib3R0b20gPSBzdGQ6Om1heChlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tLCBi b3JkZXJCb3guYm90dG9tKCkpOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBJbmxpbmVEaXNw bGF5OjpMaW5lIHsgbGluZUJveExvZ2ljYWxSZWN0LCBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LCBl bmNsb3NpbmdUb3BBbmRCb3R0b20sIHJvb3RJbmxpbmVCb3gubG9naWNhbFRvcCgpICsgcm9vdElu bGluZUJveC5iYXNlbGluZSgpLCByb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0ICsgcm9vdElu bGluZUJveC5sb2dpY2FsTGVmdCgpLCByb290SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpIH07Cisg ICAgICAgIHJldHVybiBJbmxpbmVEaXNwbGF5OjpMaW5lIHsgbGluZUJveFJlY3QsIHNjcm9sbGFi bGVPdmVyZmxvd1JlY3QsIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgcm9vdElubGluZUJveC5sb2dp Y2FsVG9wKCkgKyByb290SW5saW5lQm94LmJhc2VsaW5lKCksIHJvb3RJbmxpbmVCb3hBbGlnbm1l bnRPZmZzZXQgKyByb290SW5saW5lQm94LmxvZ2ljYWxMZWZ0KCksIHJvb3RJbmxpbmVCb3gubG9n aWNhbFdpZHRoKCkgfTsKICAgICB9OwogICAgIHJldHVybiB7IGxpbmUoKSwgbGluZUJveCB9Owog fQpAQCAtMzA3LDcgKzMwNyw3IEBAIElubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNv bnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lCiAgICAgICAgICAg ICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9 IGxheW91dFN0YXRlKCkuZm9ybWF0dGluZ1N0YXRlRm9ySW5saW5lRm9ybWF0dGluZ0NvbnRleHQo ZG93bmNhc3Q8Q29udGFpbmVyQm94PihsYXlvdXRCb3gpKTsKICAgICAgICAgICAgICAgICAgICAg YXV0byYgbGFzdExpbmUgPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5sYXN0KCk7Ci0gICAgICAg ICAgICAgICAgICAgIGF1dG8gaW5saW5lQmxvY2tCYXNlbGluZSA9IGxhc3RMaW5lLmxpbmVCb3hM b2dpY2FsUmVjdCgpLnRvcCgpICsgbGFzdExpbmUuYmFzZWxpbmUoKTsKKyAgICAgICAgICAgICAg ICAgICAgYXV0byBpbmxpbmVCbG9ja0Jhc2VsaW5lID0gbGFzdExpbmUubGluZUJveFJlY3QoKS50 b3AoKSArIGxhc3RMaW5lLmJhc2VsaW5lKCk7CiAgICAgICAgICAgICAgICAgICAgIGFzY2VudCA9 IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBpbmxpbmVMZXZlbEJveEdl b21ldHJ5LmJvcmRlckJlZm9yZSgpICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5wYWRkaW5nQmVm b3JlKCkudmFsdWVfb3IoMCkgKyBpbmxpbmVCbG9ja0Jhc2VsaW5lOwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LmlzUmVwbGFjZWRCb3goKSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaAppbmRleCBl NDc3YTM1MTMzMzQxMGQ1YzgyNDkxYzgzNTU3MjIxMGU5ODI1MDU5Li42NTU3MGI5YThmNTdmMjdm YWNjM2IzOThhZmI5OWYzNDUwYjc4NmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5TGluZS5oCkBAIC00MCw0MCArNDAsNDAgQEAgcHVibGljOgogICAg ICAgICBMYXlvdXQ6OklubGluZUxheW91dFVuaXQgdG9wIHsgMCB9OwogICAgICAgICBMYXlvdXQ6 OklubGluZUxheW91dFVuaXQgYm90dG9tIHsgMCB9OwogICAgIH07Ci0gICAgTGluZShjb25zdCBM YXlvdXQ6OklubGluZVJlY3QmIGxpbmVCb3hMb2dpY2FsUmVjdCwgY29uc3QgTGF5b3V0OjpJbmxp bmVSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgTGF5b3V0 OjpJbmxpbmVMYXlvdXRVbml0IGFsaWdtZW50QmFzZWxpbmUsIExheW91dDo6SW5saW5lTGF5b3V0 VW5pdCBjb250ZW50TG9naWNhbExlZnQsIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbFdpZHRoKTsKKyAgICBMaW5lKGNvbnN0IExheW91dDo6SW5saW5lUmVjdCYgbGluZUJv eFJlY3QsIGNvbnN0IExheW91dDo6SW5saW5lUmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNs b3NpbmdUb3BBbmRCb3R0b20sIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBhbGlnbWVudEJhc2Vs aW5lLCBMYXlvdXQ6OklubGluZUxheW91dFVuaXQgY29udGVudExlZnQsIExheW91dDo6SW5saW5l TGF5b3V0VW5pdCBjb250ZW50V2lkdGgpOwogCi0gICAgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0 JiBsaW5lQm94TG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xpbmVCb3hMb2dpY2FsUmVj dDsgfQorICAgIGNvbnN0IExheW91dDo6SW5saW5lUmVjdCYgbGluZUJveFJlY3QoKSBjb25zdCB7 IHJldHVybiBtX2xpbmVCb3hSZWN0OyB9CiAgICAgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBz Y3JvbGxhYmxlT3ZlcmZsb3coKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGFibGVPdmVyZmxvdzsg fQogCiAgICAgRW5jbG9zaW5nVG9wQW5kQm90dG9tIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpIGNv bnN0IHsgcmV0dXJuIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tOyB9CiAKICAgICBMYXlvdXQ6Oklu bGluZUxheW91dFVuaXQgYmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBtX2FsaWdtZW50QmFzZWxp bmU7IH0KIAotICAgIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQo KSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsTGVmdDsgfQotICAgIExheW91dDo6SW5s aW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250 ZW50TG9naWNhbFdpZHRoOyB9CisgICAgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRM ZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TGVmdDsgfQorICAgIExheW91dDo6SW5saW5l TGF5b3V0VW5pdCBjb250ZW50V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRXaWR0aDsg fQogCi0gICAgdm9pZCBtb3ZlVmVydGljYWxseShMYXlvdXQ6OklubGluZUxheW91dFVuaXQgb2Zm c2V0KSB7IG1fbGluZUJveExvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KG9mZnNldCk7IH0KKyAg ICB2b2lkIG1vdmVWZXJ0aWNhbGx5KExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBvZmZzZXQpIHsg bV9saW5lQm94UmVjdC5tb3ZlVmVydGljYWxseShvZmZzZXQpOyB9CiAKIHByaXZhdGU6CiAgICAg Ly8gVGhpcyBpcyBsaW5lIGJveCBnZW9tZXRyeSAoc2VlIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9j c3MtaW5saW5lLTMvI2xpbmUtYm94KS4KLSAgICBMYXlvdXQ6OklubGluZVJlY3QgbV9saW5lQm94 TG9naWNhbFJlY3Q7CisgICAgTGF5b3V0OjpJbmxpbmVSZWN0IG1fbGluZUJveFJlY3Q7CiAgICAg TGF5b3V0OjpJbmxpbmVSZWN0IG1fc2Nyb2xsYWJsZU92ZXJmbG93OwogICAgIC8vIEVuY2xvc2lu ZyB0b3AgYW5kIGJvdHRvbSBpbmNsdWRlcyBhbGwgaW5saW5lIGxldmVsIGJveGVzIChib3JkZXIg Ym94KSB2ZXJ0aWNhbGx5LgogICAgIC8vIFdoaWxlIHRoZSBsaW5lIGJveCB1c3VhbGx5IGVuY2xv c2UgdGhlbSBhcyB3ZWxsLCBpdHMgdmVydGljYWwgZ2VvbWV0cnkgaXMgYmFzZWQgb24KICAgICAv LyB0aGUgbGF5b3V0IGJvdW5kcyBvZiB0aGUgaW5saW5lIGxldmVsIGJveGVzIHdoaWNoIG1heSBi ZSBkaWZmZXJlbnQgd2hlbiBsaW5lLWhlaWdodCBpcyBwcmVzZW50LgogICAgIEVuY2xvc2luZ1Rv cEFuZEJvdHRvbSBtX2VuY2xvc2luZ1RvcEFuZEJvdHRvbTsKICAgICBMYXlvdXQ6OklubGluZUxh eW91dFVuaXQgbV9hbGlnbWVudEJhc2VsaW5lIHsgMCB9OwotICAgIExheW91dDo6SW5saW5lTGF5 b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2FsTGVmdCB7IDAgfTsKLSAgICBMYXlvdXQ6OklubGluZUxh eW91dFVuaXQgbV9jb250ZW50TG9naWNhbFdpZHRoIHsgMCB9OworICAgIExheW91dDo6SW5saW5l TGF5b3V0VW5pdCBtX2NvbnRlbnRMZWZ0IHsgMCB9OworICAgIExheW91dDo6SW5saW5lTGF5b3V0 VW5pdCBtX2NvbnRlbnRXaWR0aCB7IDAgfTsKIH07CiAKLWlubGluZSBMaW5lOjpMaW5lKGNvbnN0 IExheW91dDo6SW5saW5lUmVjdCYgbGluZUJveExvZ2ljYWxSZWN0LCBjb25zdCBMYXlvdXQ6Oklu bGluZVJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgRW5jbG9zaW5nVG9wQW5kQm90dG9tIGVuY2xv c2luZ1RvcEFuZEJvdHRvbSwgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGFsaWdtZW50QmFzZWxp bmUsIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQsIExheW91dDo6 SW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKQotICAgIDogbV9saW5lQm94TG9n aWNhbFJlY3QobGluZUJveExvZ2ljYWxSZWN0KQoraW5saW5lIExpbmU6OkxpbmUoY29uc3QgTGF5 b3V0OjpJbmxpbmVSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBz Y3JvbGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBlbmNsb3NpbmdUb3BBbmRC b3R0b20sIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBhbGlnbWVudEJhc2VsaW5lLCBMYXlvdXQ6 OklubGluZUxheW91dFVuaXQgY29udGVudExlZnQsIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBj b250ZW50V2lkdGgpCisgICAgOiBtX2xpbmVCb3hSZWN0KGxpbmVCb3hSZWN0KQogICAgICwgbV9z Y3JvbGxhYmxlT3ZlcmZsb3coc2Nyb2xsYWJsZU92ZXJmbG93KQogICAgICwgbV9lbmNsb3NpbmdU b3BBbmRCb3R0b20oZW5jbG9zaW5nVG9wQW5kQm90dG9tKQogICAgICwgbV9hbGlnbWVudEJhc2Vs aW5lKGFsaWdtZW50QmFzZWxpbmUpCi0gICAgLCBtX2NvbnRlbnRMb2dpY2FsTGVmdChjb250ZW50 TG9naWNhbExlZnQpCi0gICAgLCBtX2NvbnRlbnRMb2dpY2FsV2lkdGgoY29udGVudExvZ2ljYWxX aWR0aCkKKyAgICAsIG1fY29udGVudExlZnQoY29udGVudExlZnQpCisgICAgLCBtX2NvbnRlbnRX aWR0aChjb250ZW50V2lkdGgpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA4NGM4ZjgyY2I4ZDEzMjM4MDIxNDU4NDAyM2Ix OTQ5M2Q1NDA3MzczLi43NjI5MTJlM2M0NmQ4M2JiMzUwN2EwMjc0NDY2OWFhYzE3OTBhN2VkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBA IC00Niw3ICs0Niw3IEBAIGlubGluZSBJbmxpbmVEaXNwbGF5OjpMaW5lOjpFbmNsb3NpbmdUb3BB bmRCb3R0b20gb3BlcmF0b3IrKGNvbnN0IElubGluZURpc3BsYXk6CiAgICAgcmV0dXJuIHsgZW5j bG9zaW5nVG9wQW5kQm90dG9tLnRvcCArIG9mZnNldCwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLmJv dHRvbSArIG9mZnNldCB9OwogfQogCi1pbmxpbmUgc3RhdGljIGZsb2F0IGxpbmVPdmVyZmxvd1dp ZHRoKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0 IGxpbmVDb250ZW50TG9naWNhbFdpZHRoKQoraW5saW5lIHN0YXRpYyBmbG9hdCBsaW5lT3ZlcmZs b3dXaWR0aChjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIExheW91dDo6SW5saW5lTGF5b3V0 VW5pdCBsaW5lQ29udGVudFdpZHRoKQogewogICAgIC8vIEZJWE1FOiBJdCdzIHRoZSBjb3B5IG9m IHRoZSBsZXRzLWFkanVzdC1vdmVyZmxvdy1mb3ItdGhlLWNhcmV0IGJlaGF2aW9yIGZyb20gTGVn YWN5TGluZUxheW91dDo6YWRkT3ZlcmZsb3dGcm9tSW5saW5lQ2hpbGRyZW4uCiAgICAgYXV0byBl bmRQYWRkaW5nID0gZmxvdy5oYXNOb25WaXNpYmxlT3ZlcmZsb3coKSA/IGZsb3cucGFkZGluZ0Vu ZCgpIDogMF9sdTsKQEAgLTU0LDcgKzU0LDcgQEAgaW5saW5lIHN0YXRpYyBmbG9hdCBsaW5lT3Zl cmZsb3dXaWR0aChjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIExheW91dDo6SW5saW4KICAg ICAgICAgZW5kUGFkZGluZyA9IGZsb3cuZW5kUGFkZGluZ1dpZHRoRm9yQ2FyZXQoKTsKICAgICBp ZiAoZmxvdy5oYXNOb25WaXNpYmxlT3ZlcmZsb3coKSAmJiAhZW5kUGFkZGluZyAmJiBmbG93LmVs ZW1lbnQoKSAmJiBmbG93LmVsZW1lbnQoKS0+aXNSb290RWRpdGFibGVFbGVtZW50KCkpCiAgICAg ICAgIGVuZFBhZGRpbmcgPSAxOwotICAgIHJldHVybiBsaW5lQ29udGVudExvZ2ljYWxXaWR0aCAr IGVuZFBhZGRpbmc7CisgICAgcmV0dXJuIGxpbmVDb250ZW50V2lkdGggKyBlbmRQYWRkaW5nOwog fQogCiBJbmxpbmVDb250ZW50QnVpbGRlcjo6SW5saW5lQ29udGVudEJ1aWxkZXIoY29uc3QgUmVu ZGVyQmxvY2tGbG93JiBibG9ja0Zsb3csIGNvbnN0IEJveFRyZWUmIGJveFRyZWUpCkBAIC03OSw3 ICs3OSw3IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5lcyhM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYgaW5sCiAgICAgZm9yIChzaXplX3QgbGluZUlu ZGV4ID0gMDsgbGluZUluZGV4IDwgbGluZXMuc2l6ZSgpOyArK2xpbmVJbmRleCkgewogICAgICAg ICBhdXRvJiBsaW5lID0gbGluZXNbbGluZUluZGV4XTsKICAgICAgICAgYXV0byBzY3JvbGxhYmxl T3ZlcmZsb3dSZWN0ID0gRmxvYXRSZWN0IHsgbGluZS5zY3JvbGxhYmxlT3ZlcmZsb3coKSB9Owot ICAgICAgICBpZiAoYXV0byBvdmVyZmxvd1dpZHRoID0gbGluZU92ZXJmbG93V2lkdGgobV9ibG9j a0Zsb3csIGxpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpKTsgb3ZlcmZsb3dXaWR0aCA+IHNjcm9s bGFibGVPdmVyZmxvd1JlY3Qud2lkdGgoKSkKKyAgICAgICAgaWYgKGF1dG8gb3ZlcmZsb3dXaWR0 aCA9IGxpbmVPdmVyZmxvd1dpZHRoKG1fYmxvY2tGbG93LCBsaW5lLmNvbnRlbnRXaWR0aCgpKTsg b3ZlcmZsb3dXaWR0aCA+IHNjcm9sbGFibGVPdmVyZmxvd1JlY3Qud2lkdGgoKSkKICAgICAgICAg ICAgIHNjcm9sbGFibGVPdmVyZmxvd1JlY3Quc2V0V2lkdGgob3ZlcmZsb3dXaWR0aCk7CiAKICAg ICAgICAgYXV0byBmaXJzdEJveEluZGV4ID0gYm94SW5kZXg7CkBAIC0xMTIsOSArMTEyLDggQEAg dm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKExheW91dDo6SW5s aW5lRm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICAgICAgICAgICAgICBpbmxpbmVDb250ZW50Lmhh c011bHRpbGluZVBhaW50T3ZlcmxhcCA9IHRydWU7CiAgICAgICAgIH0KIAotICAgICAgICBhdXRv IGxpbmVCb3hMb2dpY2FsUmVjdCA9IEZsb2F0UmVjdCB7IGxpbmUubGluZUJveExvZ2ljYWxSZWN0 KCkgfTsKICAgICAgICAgYXV0byBib3hDb3VudCA9IGJveEluZGV4IC0gZmlyc3RCb3hJbmRleDsK LSAgICAgICAgaW5saW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBmaXJzdEJveEluZGV4LCBib3hD b3VudCwgbGluZUJveExvZ2ljYWxSZWN0LCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpLnRv cCwgbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKS5ib3R0b20sIHNjcm9sbGFibGVPdmVyZmxv d1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5jb250ZW50 TG9naWNhbExlZnQoKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkgfSk7CisgICAgICAgIGlu bGluZUNvbnRlbnQubGluZXMuYXBwZW5kKHsgZmlyc3RCb3hJbmRleCwgYm94Q291bnQsIEZsb2F0 UmVjdCB7IGxpbmUubGluZUJveFJlY3QoKSB9LCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgp LnRvcCwgbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKS5ib3R0b20sIHNjcm9sbGFibGVPdmVy Zmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5jb250 ZW50TGVmdCgpLCBsaW5lLmNvbnRlbnRXaWR0aCgpIH0pOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3Bw CmluZGV4IDhiZjMyZTU5M2YzN2M0OTgyMmMxYzk1YTc4ZmM3NmQ4MDZkNzliMDUuLjU2MDg4YTAz OWZhNjZjMTEzZjYyMTM5ZGIyMDNlMjc3ZTM2NTdmZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKQEAgLTM3NCw5 ICszNzQsOSBAQCB2b2lkIHNob3dJbmxpbmVUcmVlQW5kUnVucyhUZXh0U3RyZWFtJiBzdHJlYW0s IGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgYwogICAgICAgICB9OwogICAgICAgICBh ZGRTcGFjaW5nKCk7CiAgICAgICAgIGF1dG8mIGxpbmUgPSBsaW5lc1tsaW5lSW5kZXhdOwotICAg ICAgICBhdXRvJiBsaW5lQm94TG9naWNhbFJlY3QgPSBsaW5lLmxpbmVCb3hMb2dpY2FsUmVjdCgp OworICAgICAgICBhdXRvJiBsaW5lQm94UmVjdCA9IGxpbmUubGluZUJveFJlY3QoKTsKICAgICAg ICAgYXV0byBlbmNsb3NpbmdUb3BBbmRCb3R0b20gPSBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRv bSgpOwotICAgICAgICBzdHJlYW0gPDwgImxpbmUgYXQgKCIgPDwgbGluZUJveExvZ2ljYWxSZWN0 LmxlZnQoKSA8PCAiLCIgPDwgbGluZUJveExvZ2ljYWxSZWN0LnRvcCgpIDw8ICIpIHNpemUgKCIg PDwgbGluZUJveExvZ2ljYWxSZWN0LndpZHRoKCkgPDwgIngiIDw8IGxpbmVCb3hMb2dpY2FsUmVj dC5oZWlnaHQoKSA8PCAiKSBiYXNlbGluZSAoIiA8PCBsaW5lLmJhc2VsaW5lKCkgPDwgIikgZW5j bG9zaW5nIHRvcCAoIiA8PCBlbmNsb3NpbmdUb3BBbmRCb3R0b20udG9wIDw8ICIpIGJvdHRvbSAo IiA8PCBlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tIDw8ICIpIjsKKyAgICAgICAgc3RyZWFt IDw8ICJsaW5lIGF0ICgiIDw8IGxpbmVCb3hSZWN0LmxlZnQoKSA8PCAiLCIgPDwgbGluZUJveFJl Y3QudG9wKCkgPDwgIikgc2l6ZSAoIiA8PCBsaW5lQm94UmVjdC53aWR0aCgpIDw8ICJ4IiA8PCBs aW5lQm94UmVjdC5oZWlnaHQoKSA8PCAiKSBiYXNlbGluZSAoIiA8PCBsaW5lLmJhc2VsaW5lKCkg PDwgIikgZW5jbG9zaW5nIHRvcCAoIiA8PCBlbmNsb3NpbmdUb3BBbmRCb3R0b20udG9wIDw8ICIp IGJvdHRvbSAoIiA8PCBlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tIDw8ICIpIjsKICAgICAg ICAgc3RyZWFtLm5leHRMaW5lKCk7CiAKICAgICAgICAgYWRkU3BhY2luZygpOwo=