201372 2019-08-30 18:49:01 -0700 [LFC] Transition from Geometry(formattingContext()) to formattingContext().quirks() 2019-08-30 21:04:02 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1566921 0 zalan 2019-08-30 18:49:01 -0700 ssia 1566922 1 webkit-bug-importer 2019-08-30 18:49:28 -0700 <rdar://problem/54905514> 1566923 2 377778 zalan 2019-08-30 18:51:32 -0700 Created attachment 377778 Patch 1566933 3 377783 zalan 2019-08-30 20:21:55 -0700 Created attachment 377783 Patch 1566936 4 377783 commit-queue 2019-08-30 21:04:00 -0700 Comment on attachment 377783 Patch Clearing flags on attachment: 377783 Committed r249357: <https://trac.webkit.org/changeset/249357> 1566937 5 commit-queue 2019-08-30 21:04:02 -0700 All reviewed patches have been landed. Closing bug. 377778 2019-08-30 18:51:32 -0700 2019-08-30 20:21:53 -0700 Patch bug-201372-20190830185125.patch text/plain 12307 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRiZjc3ZGZlYzliOGJk YzAzZjNlNjZhMjY1NDM3YzNiNWVlZjUxMi4uOGRmNTQxM2JkOTk0M2E4YjFjYzJkNGRkNTE4NWE0 NTdkYjBjOTIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA4LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gVHJhbnNpdGlvbiBm cm9tIEdlb21ldHJ5KGZvcm1hdHRpbmdDb250ZXh0KCkpIHRvIGZvcm1hdHRpbmdDb250ZXh0KCku cXVpcmtzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMTM3MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTQ5MDU1MTQ+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRIZWlnaHRWYWx1ZSBjb25zdCk6CisgICAgICAgICog bGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGVpZ2h0VmFsdWVPZk5lYXJlc3RDb250 YWluaW5nQmxvY2tXaXRoRml4ZWRIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdo dEFuZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpzdHJldGNoZWRJbkZsb3dIZWlnaHQpOgorICAgICAg ICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxh cHNlOjpwb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZlTmVnYXRpdmVN YXJnaW5CZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmb3JlKToKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlv dXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6SW5saW5lTGF5b3V0OjpsYXlvdXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5lTGF5b3V0Ojpjb21wdXRlZEludHJpbnNp Y1dpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OklubGluZUxheW91dDo6Y3JlYXRlRGlzcGxheVJ1bnMgY29uc3QpOgorICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lOjpjbG9zZSk6CisKIDIwMTktMDgtMzAgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBQcm94eSBMYXlvdXRTdGF0ZTo6ZGlz cGxheUJveEZvckxheW91dEJveCgpIGNhbGxzIHRocm91Z2ggRm9ybWF0dGluZ0NvbnRleHQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAppbmRleCA0ZjczYWY1NzI3NTU1OGQ5YTRiNWM5MWRiMmI5MzdkOGU4ZjNkNjY1Li44NjZjMmM4 ZDE5MTBjMjdkNGFiN2VkMzUxM2EzYzM3YzNmMTMwMWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC03NSw3ICs3NSw3 IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29t cHV0ZWRIZWlnaHRWYWx1ZShjb25zdCBCb3gmCiAgICAgICAgIGNvbnRhaW5pbmdCbG9ja0hlaWdo dFZhbHVlID0gZm9ybWF0dGluZ0NvbnRleHQoKS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpsYXlv dXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLmhlaWdodCgpOwogICAgIH0gZWxzZSB7CiAgICAgICAg IGlmIChsYXlvdXRTdGF0ZSgpLmluUXVpcmtzTW9kZSgpKQotICAgICAgICAgICAgY29udGFpbmlu Z0Jsb2NrSGVpZ2h0VmFsdWUgPSBRdWlya3MoZm9ybWF0dGluZ0NvbnRleHQoKSkuaGVpZ2h0VmFs dWVPZk5lYXJlc3RDb250YWluaW5nQmxvY2tXaXRoRml4ZWRIZWlnaHQobGF5b3V0Qm94KTsKKyAg ICAgICAgICAgIGNvbnRhaW5pbmdCbG9ja0hlaWdodFZhbHVlID0gZm9ybWF0dGluZ0NvbnRleHQo KS5xdWlya3MoKS5oZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhGaXhlZEhl aWdodChsYXlvdXRCb3gpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGF1dG8gY29udGFp bmluZ0Jsb2NrSGVpZ2h0ID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLmxv Z2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAgIGlmIChjb250YWluaW5nQmxvY2tIZWlnaHQuaXNG aXhlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dFF1 aXJrcy5jcHAKaW5kZXggYmYyYTQ5OTQ0ZTM2NDg3NGIwNDI0ZjgwOGM3ODE5NmU4YTY0MGUzOS4u MjVjNGZiY2QzYmMzMjU2OWFkYjhkZmIwOTMxNTJhNzNlM2MwMWYyMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCkBAIC01Myw3ICs1 Myw3IEBAIExheW91dFVuaXQgRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGVpZ2h0VmFsdWVP Zk5lYXJlc3RDb250YWluaW5nQmxvY2tXaXRoRml4CiAgICAgICAgICAgICBhdXRvJiBkaXNwbGF5 Qm94ID0gZm9ybWF0dGluZ0NvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveCgqY29udGFpbmlu Z0Jsb2NrKTsKIAogICAgICAgICAgICAgYXV0byB1c2VkVmFsdWVzID0gVXNlZEhvcml6b250YWxW YWx1ZXMgeyBmb3JtYXR0aW5nQ29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpjb250YWlu aW5nQmxvY2stPmNvbnRhaW5pbmdCbG9jaygpKS5jb250ZW50Qm94V2lkdGgoKSB9OwotICAgICAg ICAgICAgYXV0byB2ZXJ0aWNhbE1hcmdpbiA9IEdlb21ldHJ5KGZvcm1hdHRpbmdDb250ZXh0KS5j b21wdXRlZFZlcnRpY2FsTWFyZ2luKCpjb250YWluaW5nQmxvY2ssIHVzZWRWYWx1ZXMpOworICAg ICAgICAgICAgYXV0byB2ZXJ0aWNhbE1hcmdpbiA9IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5 KCkuY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbigqY29udGFpbmluZ0Jsb2NrLCB1c2VkVmFsdWVzKTsK ICAgICAgICAgICAgIGF1dG8gdmVydGljYWxQYWRkaW5nID0gZGlzcGxheUJveC5wYWRkaW5nVG9w KCkudmFsdWVPcigwKSArIGRpc3BsYXlCb3gucGFkZGluZ0JvdHRvbSgpLnZhbHVlT3IoMCk7CiAg ICAgICAgICAgICBhdXRvIHZlcnRpY2FsQm9yZGVyID0gZGlzcGxheUJveC5ib3JkZXJUb3AoKSAr IGRpc3BsYXlCb3guYm9yZGVyQm90dG9tKCk7CiAgICAgICAgICAgICBib2R5QW5kRG9jdW1lbnRW ZXJ0aWNhbE1hcmdpblBhZGRpbmdBbmRCb3JkZXIgKz0gdmVydGljYWxNYXJnaW4uYmVmb3JlLnZh bHVlT3IoMCkgKyB2ZXJ0aWNhbE1hcmdpbi5hZnRlci52YWx1ZU9yKDApICsgdmVydGljYWxQYWRk aW5nICsgdmVydGljYWxCb3JkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKaW5kZXggZWY5YjFhMTdkZWYyZDg2NDE5ZjlkYTBiOWRhYmE5MjkxNDEyNjJl Yy4uYjhhZjE4ZjQ3ZDVkNzU5M2RkZTc0Y2I1YzljMDg4ZTdmNTI0MWIyZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMjc0LDcgKzI3NCw3IEBA IEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93 SGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJvCiAgICAgICAgIGhlaWdodEFuZE1hcmdpbiA9IGNvbXBs aWNhdGVkQ2FzZXMobGF5b3V0Qm94LCB1c2VkVmFsdWVzLCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7 CiAgICAgfQogCi0gICAgYXV0byBxdWlya3MgPSBRdWlya3MoZm9ybWF0dGluZ0NvbnRleHQoKSk7 CisgICAgYXV0byBxdWlya3MgPSBmb3JtYXR0aW5nQ29udGV4dCgpLnF1aXJrcygpOwogICAgIGlm ICghcXVpcmtzLm5lZWRzU3RyZXRjaGluZyhsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4gaGVp Z2h0QW5kTWFyZ2luOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNw cAppbmRleCA2NWQxMmY5MzlhZTVmZmI0MTg1MDQwNjE5NDQ0OTk3ZTdlYTkyMWE2Li4zZWQzZmY4 NzFmZmZlNjk3ODc4ZmVlMWExNzZkZTgxNTQ1YmE1NmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTgyLDcgKzgyLDcgQEAgSGVpZ2h0QW5kTWFyZ2lu IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6c3RyZXRjaGVkSW5GbG93SGVpZ2h0KGNv bnN0IEJveCYKICAgICAgICAgLy8gSGVyZSBpcyB0aGUgcXVpcmt5IHBhcnQgZm9yIGJvZHkgYm94 OgogICAgICAgICAvLyBTdHJldGNoIHRoZSBib2R5IHVzaW5nIHRoZSBpbml0aWFsIGNvbnRhaW5p bmcgYmxvY2sncyBoZWlnaHQgYW5kIHNocmluayBpdCB3aXRoIGRvY3VtZW50IGJveCdzIG1hcmdp bi9ib3JkZXIvcGFkZGluZy4KICAgICAgICAgLy8gVGhpcyBsb29rcyBleHRyZW1lbHkgb2RkIHdo ZW4gaHRtbCBoYXMgbm9uLWF1dG8gaGVpZ2h0LgotICAgICAgICBhdXRvIGRvY3VtZW50Qm94VmVy dGljYWxNYXJnaW4gPSBHZW9tZXRyeShmb3JtYXR0aW5nQ29udGV4dCkuY29tcHV0ZWRWZXJ0aWNh bE1hcmdpbihkb2N1bWVudEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgeyBpbml0aWFsQ29udGFp bmluZ0Jsb2NrRGlzcGxheUJveC5jb250ZW50Qm94V2lkdGgoKSB9KTsKKyAgICAgICAgYXV0byBk b2N1bWVudEJveFZlcnRpY2FsTWFyZ2luID0gZm9ybWF0dGluZ0NvbnRleHQuZ2VvbWV0cnkoKS5j b21wdXRlZFZlcnRpY2FsTWFyZ2luKGRvY3VtZW50Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7 IGluaXRpYWxDb250YWluaW5nQmxvY2tEaXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpIH0pOwog ICAgICAgICBzdHJlY2hlZEhlaWdodCAtPSAoZG9jdW1lbnRCb3hWZXJ0aWNhbE1hcmdpbi5iZWZv cmUudmFsdWVPcigwKSArIGRvY3VtZW50Qm94VmVydGljYWxNYXJnaW4uYWZ0ZXIudmFsdWVPcigw KSk7CiAKICAgICAgICAgYXV0byYgYm9keUJveERpc3BsYXlCb3ggPSBmb3JtYXR0aW5nQ29udGV4 dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNl LmNwcAppbmRleCA0OWIwZTdjNzJjNDRhNWJhNTVmOGVlYTY4OTU5NTg0ZDdkNmQ4ZmZkLi5jMDQ2 NzEwMTczNTE3OGUwYTI5MDFiYzFlMjAyYjdkMDk3ZTJmMzI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xs YXBzZS5jcHAKQEAgLTUxNSw3ICs1MTUsNyBAQCBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxN YXJnaW46OlZhbHVlcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZQogICAg IH0KICAgICAvLyBUaGlzIGlzIHRoZSBlc3RpbWF0ZSBwYXRoLiBXZSBkb24ndCB5ZXQgaGF2ZSBw b3NpdGl2ZS9uZWdhdGl2ZSBtYXJnaW4gY29tcHV0ZWQuCiAgICAgYXV0byB1c2VkVmFsdWVzID0g VXNlZEhvcml6b250YWxWYWx1ZXMgeyBmb3JtYXR0aW5nQ29udGV4dCgpLmRpc3BsYXlCb3hGb3JM YXlvdXRCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29udGVudEJveFdpZHRoKCkg fTsKLSAgICBhdXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeShmb3JtYXR0aW5n Q29udGV4dCgpKS5jb21wdXRlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwgdXNlZFZhbHVlcyk7 CisgICAgYXV0byBjb21wdXRlZFZlcnRpY2FsTWFyZ2luID0gZm9ybWF0dGluZ0NvbnRleHQoKS5n ZW9tZXRyeSgpLmNvbXB1dGVkVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkVmFsdWVzKTsK ICAgICBhdXRvIG5vbkNvbGxhcHNlZE1hcmdpbiA9IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29s bGFwc2VkVmFsdWVzIHsgY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5iZWZvcmUudmFsdWVPcigwKSwg Y29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5hZnRlci52YWx1ZU9yKDApIH07IAogCiAgICAgaWYgKG1h cmdpblR5cGUgPT0gTWFyZ2luVHlwZTo6QmVmb3JlKQpAQCAtNTQxLDcgKzU0MSw3IEBAIFBvc2l0 aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Ok1hcmdpbkNvbGxhcHNlCiAgICAgLy8gMi4gR2F0aGVyIHBvc2l0aXZlIGFuZCBuZWdhdGl2 ZSBtYXJnaW4gdmFsdWVzIGZyb20gcHJldmlvdXMgaW5mbG93IHNpYmxpbmcgaWYgbWFyZ2lucyBh cmUgYWRqb2luaW5nLgogICAgIC8vIDMuIENvbXB1dGUgbWluL21heCBwb3NpdGl2ZSBhbmQgbmVn YXRpdmUgY29sbGFwc2VkIG1hcmdpbiB2YWx1ZXMgdXNpbmcgbm9uLWNvbGxwYXNlZCBjb21wdXRl ZCBtYXJnaW4gYmVmb3JlLgogICAgIGF1dG8gY29sbGFwc2VkTWFyZ2luQmVmb3JlID0gY29tcHV0 ZWRQb3NpdGl2ZUFuZE5lZ2F0aXZlTWFyZ2luKGZpcnN0Q2hpbGRDb2xsYXBzZWRNYXJnaW5CZWZv cmUoKSwgcHJldmlvdVNpYmxpbmdDb2xsYXBzZWRNYXJnaW5BZnRlcigpKTsKLSAgICBpZiAoY29s bGFwc2VkTWFyZ2luQmVmb3JlLmlzUXVpcmsgJiYgUXVpcmtzKGZvcm1hdHRpbmdDb250ZXh0KCkp LnNob3VsZElnbm9yZUNvbGxhcHNlZFF1aXJrTWFyZ2luKGxheW91dEJveCkpCisgICAgaWYgKGNv bGxhcHNlZE1hcmdpbkJlZm9yZS5pc1F1aXJrICYmIGZvcm1hdHRpbmdDb250ZXh0KCkucXVpcmtz KCkuc2hvdWxkSWdub3JlQ29sbGFwc2VkUXVpcmtNYXJnaW4obGF5b3V0Qm94KSkKICAgICAgICAg Y29sbGFwc2VkTWFyZ2luQmVmb3JlID0geyB9OwogCiAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZl cnRpY2FsTWFyZ2luOjpWYWx1ZXMgbm9uQ29sbGFwc2VkQmVmb3JlOwpAQCAtNTgzLDcgKzU4Myw3 IEBAIEVzdGltYXRlZE1hcmdpbkJlZm9yZSBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5D b2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmCiAgICAgQVNTRVJUKCFsYXlvdXRCb3gucmVwbGFj ZWQoKSk7CiAKICAgICBhdXRvIHVzZWRWYWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IGZv cm1hdHRpbmdDb250ZXh0KCkuZGlzcGxheUJveEZvckxheW91dEJveCgqbGF5b3V0Qm94LmNvbnRh aW5pbmdCbG9jaygpKS5jb250ZW50Qm94V2lkdGgoKSB9OwotICAgIGF1dG8gY29tcHV0ZWRWZXJ0 aWNhbE1hcmdpbiA9IEdlb21ldHJ5KGZvcm1hdHRpbmdDb250ZXh0KCkpLmNvbXB1dGVkVmVydGlj YWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkVmFsdWVzKTsKKyAgICBhdXRvIGNvbXB1dGVkVmVydGlj YWxNYXJnaW4gPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5KCkuY29tcHV0ZWRWZXJ0aWNh bE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOwogICAgIGF1dG8gbm9uQ29sbGFwc2VkTWFy Z2luID0gVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMgeyBjb21wdXRlZFZl cnRpY2FsTWFyZ2luLmJlZm9yZS52YWx1ZU9yKDApLCBjb21wdXRlZFZlcnRpY2FsTWFyZ2luLmFm dGVyLnZhbHVlT3IoMCkgfTsKICAgICBhdXRvIG1hcmdpbnNDb2xsYXBzZVRocm91Z2ggPSB0aGlz LT5tYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGxheW91dEJveCk7CiAgICAgYXV0byBwb3NpdGl2ZU5l Z2F0aXZlTWFyZ2luQmVmb3JlID0gdGhpcy0+cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZShs YXlvdXRCb3gsIG5vbkNvbGxhcHNlZE1hcmdpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlv dXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAppbmRleCA5NmYzMTgxZTRlMTBjZTg3OWQwZDY5 Nzk5ZjUxZDU2MzI3NzZmZGQzLi5mYmNjMWIzNzNkYjBiM2Q4ZTI4MzI4OTczMGEwMWEwZmNjMTYx ZjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91 dC5jcHAKQEAgLTMyNCw3ICszMjQsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpJ bmxpbmVMYXlvdXQ6OmxheW91dChjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbQogICAgIH07 CiAKICAgICBJbmRleEFuZFJhbmdlIGN1cnJlbnRJbmxpbmVJdGVtOwotICAgIGF1dG8gcXVpcmtz ID0gUXVpcmtzKGZvcm1hdHRpbmdDb250ZXh0KTsKKyAgICBhdXRvIHF1aXJrcyA9IGZvcm1hdHRp bmdDb250ZXh0LnF1aXJrcygpOwogICAgIHdoaWxlIChjdXJyZW50SW5saW5lSXRlbS5pbmRleCA8 IGlubGluZUl0ZW1zLnNpemUoKSkgewogICAgICAgICBhdXRvIGxpbmVJbnB1dCA9IExpbmVJbnB1 dCB7IHsgeyBsaW5lTG9naWNhbExlZnQsIGxpbmVMb2dpY2FsVG9wIH0sIHdpZHRoQ29uc3RyYWlu dCwgcXVpcmtzLmxpbmVIZWlnaHRDb25zdHJhaW50cyhmb3JtYXR0aW5nUm9vdCkgfSwgTGluZTo6 U2tpcFZlcnRpY2FsQWxpZ21lbnQ6Ok5vLCBjdXJyZW50SW5saW5lSXRlbSwgaW5saW5lSXRlbXMg fTsKICAgICAgICAgYXBwbHlGbG9hdENvbnN0cmFpbnQobGluZUlucHV0KTsKQEAgLTM0Nyw3ICsz NDcsNyBAQCBMYXlvdXRVbml0IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6 OmNvbXB1dGVkSW50cmluc2ljV2lkdGgoY29uc3QgSQogICAgIGF1dG8mIGZvcm1hdHRpbmdDb250 ZXh0ID0gdGhpcy0+Zm9ybWF0dGluZ0NvbnRleHQoKTsKICAgICBMYXlvdXRVbml0IG1heGltdW1M aW5lV2lkdGg7CiAgICAgSW5kZXhBbmRSYW5nZSBjdXJyZW50SW5saW5lSXRlbTsKLSAgICBhdXRv IHF1aXJrcyA9IFF1aXJrcyhmb3JtYXR0aW5nQ29udGV4dCk7CisgICAgYXV0byBxdWlya3MgPSBm b3JtYXR0aW5nQ29udGV4dC5xdWlya3MoKTsKICAgICB3aGlsZSAoY3VycmVudElubGluZUl0ZW0u aW5kZXggPCBpbmxpbmVJdGVtcy5zaXplKCkpIHsKICAgICAgICAgYXV0byBsaW5lQ29udGVudCA9 IExpbmVMYXlvdXQoZm9ybWF0dGluZ0NvbnRleHQsIHsgeyB7IH0sIHdpZHRoQ29uc3RyYWludCwg cXVpcmtzLmxpbmVIZWlnaHRDb25zdHJhaW50cyhmb3JtYXR0aW5nUm9vdCgpKSB9LCBMaW5lOjpT a2lwVmVydGljYWxBbGlnbWVudDo6WWVzLCBjdXJyZW50SW5saW5lSXRlbSwgaW5saW5lSXRlbXMg fSkubGF5b3V0KCk7CiAgICAgICAgIGN1cnJlbnRJbmxpbmVJdGVtID0geyBsaW5lQ29udGVudC5s YXN0Q29tbWl0dGVkLT5pbmRleCArIDEsIFdURjo6bnVsbG9wdCB9OwpAQCAtMzkzLDcgKzM5Myw3 IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OklubGluZUxheW91dDo6Y3JlYXRlRGlz cGxheVJ1bnMoY29uc3QgTGluZTo6Q29udGVuCiAgICAgYXV0byBsaW5lQm94UmVjdCA9IERpc3Bs YXk6OlJlY3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wKCksIGxpbmVDb250ZW50LmxvZ2ljYWxM ZWZ0KCksIDAsIGxpbmVDb250ZW50LmxvZ2ljYWxIZWlnaHQoKX07CiAgICAgLy8gQ3JlYXRlIGZp bmFsIGRpc3BsYXkgcnVucy4KICAgICBhdXRvJiBsaW5lUnVucyA9IGxpbmVDb250ZW50LnJ1bnMo KTsKLSAgICBhdXRvIGdlb21ldHJ5ID0gR2VvbWV0cnkoZm9ybWF0dGluZ0NvbnRleHQpOworICAg IGF1dG8gZ2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeSgpOwogICAgIGZvciAo dW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IGxpbmVSdW5zLnNpemUoKTsgKytpbmRleCkgewog ICAgICAgICBhdXRvJiBsaW5lUnVuID0gbGluZVJ1bnMuYXQoaW5kZXgpOwogICAgICAgICBhdXRv JiBsb2dpY2FsUmVjdCA9IGxpbmVSdW4tPmxvZ2ljYWxSZWN0KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IGNm ZWI4ZDM0YWE3YjhjMmE3NGE0NWNmMGM1MWY0Zjc3MzAyMzkxZDIuLmVlOTU1MTlmMjliM2NiZTMx Njk2MGM2YzEyOGViYzM2YzZhMTM0YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAg c3RkOjp1bmlxdWVfcHRyPExpbmU6OkNvbnRlbnQ+IExpbmU6OmNsb3NlKCkKICAgICAgICAgfQog CiAgICAgICAgIC8vIFJlbW92ZSBkZXNjZW50IHdoZW4gYWxsIGNvbnRlbnQgaXMgYmFzZWxpbmUg YWxpZ25lZCBidXQgbm9uZSBvZiB0aGVtIGhhdmUgZGVzY2VudC4KLSAgICAgICAgaWYgKElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3MoZm9ybWF0dGluZ0NvbnRleHQoKSkubGluZURlc2Nl bnROZWVkc0NvbGxhcHNpbmcoKm1fY29udGVudCkpIHsKKyAgICAgICAgaWYgKGZvcm1hdHRpbmdD b250ZXh0KCkucXVpcmtzKCkubGluZURlc2NlbnROZWVkc0NvbGxhcHNpbmcoKm1fY29udGVudCkp IHsKICAgICAgICAgICAgIG1fbGluZUxvZ2ljYWxIZWlnaHQgLT0gbV9iYXNlbGluZS5kZXNjZW50 OwogICAgICAgICAgICAgbV9iYXNlbGluZS5kZXNjZW50ID0geyB9OwogICAgICAgICB9Cg== 377783 2019-08-30 20:21:55 -0700 2019-08-30 21:04:00 -0700 Patch bug-201372-20190830202148.patch text/plain 12307 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MzU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExYTcxYTlkZmRjNDYw MDQ2ZmE2YzVjNzk3NmJjMWRlYmY1NmEzMC4uNDYxZDZjZmY4MTViMGZiNTZkYTZkNzljZWE4NzFl ZjBkMTllMzA0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA4LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gVHJhbnNpdGlvbiBm cm9tIEdlb21ldHJ5KGZvcm1hdHRpbmdDb250ZXh0KCkpIHRvIGZvcm1hdHRpbmdDb250ZXh0KCku cXVpcmtzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMTM3MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTQ5MDU1MTQ+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRIZWlnaHRWYWx1ZSBjb25zdCk6CisgICAgICAgICog bGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGVpZ2h0VmFsdWVPZk5lYXJlc3RDb250 YWluaW5nQmxvY2tXaXRoRml4ZWRIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdo dEFuZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpzdHJldGNoZWRJbkZsb3dIZWlnaHQpOgorICAgICAg ICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxh cHNlOjpwb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZlTmVnYXRpdmVN YXJnaW5CZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmb3JlKToKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlv dXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6SW5saW5lTGF5b3V0OjpsYXlvdXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5lTGF5b3V0Ojpjb21wdXRlZEludHJpbnNp Y1dpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OklubGluZUxheW91dDo6Y3JlYXRlRGlzcGxheVJ1bnMgY29uc3QpOgorICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lOjpjbG9zZSk6CisKIDIwMTktMDgtMzAgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBQcm94eSBMYXlvdXRTdGF0ZTo6ZGlz cGxheUJveEZvckxheW91dEJveCgpIGNhbGxzIHRocm91Z2ggRm9ybWF0dGluZ0NvbnRleHQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAppbmRleCA0ZjczYWY1NzI3NTU1OGQ5YTRiNWM5MWRiMmI5MzdkOGU4ZjNkNjY1Li44NjZjMmM4 ZDE5MTBjMjdkNGFiN2VkMzUxM2EzYzM3YzNmMTMwMWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC03NSw3ICs3NSw3 IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29t cHV0ZWRIZWlnaHRWYWx1ZShjb25zdCBCb3gmCiAgICAgICAgIGNvbnRhaW5pbmdCbG9ja0hlaWdo dFZhbHVlID0gZm9ybWF0dGluZ0NvbnRleHQoKS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpsYXlv dXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLmhlaWdodCgpOwogICAgIH0gZWxzZSB7CiAgICAgICAg IGlmIChsYXlvdXRTdGF0ZSgpLmluUXVpcmtzTW9kZSgpKQotICAgICAgICAgICAgY29udGFpbmlu Z0Jsb2NrSGVpZ2h0VmFsdWUgPSBRdWlya3MoZm9ybWF0dGluZ0NvbnRleHQoKSkuaGVpZ2h0VmFs dWVPZk5lYXJlc3RDb250YWluaW5nQmxvY2tXaXRoRml4ZWRIZWlnaHQobGF5b3V0Qm94KTsKKyAg ICAgICAgICAgIGNvbnRhaW5pbmdCbG9ja0hlaWdodFZhbHVlID0gZm9ybWF0dGluZ0NvbnRleHQo KS5xdWlya3MoKS5oZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhGaXhlZEhl aWdodChsYXlvdXRCb3gpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGF1dG8gY29udGFp bmluZ0Jsb2NrSGVpZ2h0ID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLmxv Z2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAgIGlmIChjb250YWluaW5nQmxvY2tIZWlnaHQuaXNG aXhlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dFF1 aXJrcy5jcHAKaW5kZXggYmYyYTQ5OTQ0ZTM2NDg3NGIwNDI0ZjgwOGM3ODE5NmU4YTY0MGUzOS4u MjVjNGZiY2QzYmMzMjU2OWFkYjhkZmIwOTMxNTJhNzNlM2MwMWYyMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCkBAIC01Myw3ICs1 Myw3IEBAIExheW91dFVuaXQgRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGVpZ2h0VmFsdWVP Zk5lYXJlc3RDb250YWluaW5nQmxvY2tXaXRoRml4CiAgICAgICAgICAgICBhdXRvJiBkaXNwbGF5 Qm94ID0gZm9ybWF0dGluZ0NvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveCgqY29udGFpbmlu Z0Jsb2NrKTsKIAogICAgICAgICAgICAgYXV0byB1c2VkVmFsdWVzID0gVXNlZEhvcml6b250YWxW YWx1ZXMgeyBmb3JtYXR0aW5nQ29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpjb250YWlu aW5nQmxvY2stPmNvbnRhaW5pbmdCbG9jaygpKS5jb250ZW50Qm94V2lkdGgoKSB9OwotICAgICAg ICAgICAgYXV0byB2ZXJ0aWNhbE1hcmdpbiA9IEdlb21ldHJ5KGZvcm1hdHRpbmdDb250ZXh0KS5j b21wdXRlZFZlcnRpY2FsTWFyZ2luKCpjb250YWluaW5nQmxvY2ssIHVzZWRWYWx1ZXMpOworICAg ICAgICAgICAgYXV0byB2ZXJ0aWNhbE1hcmdpbiA9IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5 KCkuY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbigqY29udGFpbmluZ0Jsb2NrLCB1c2VkVmFsdWVzKTsK ICAgICAgICAgICAgIGF1dG8gdmVydGljYWxQYWRkaW5nID0gZGlzcGxheUJveC5wYWRkaW5nVG9w KCkudmFsdWVPcigwKSArIGRpc3BsYXlCb3gucGFkZGluZ0JvdHRvbSgpLnZhbHVlT3IoMCk7CiAg ICAgICAgICAgICBhdXRvIHZlcnRpY2FsQm9yZGVyID0gZGlzcGxheUJveC5ib3JkZXJUb3AoKSAr IGRpc3BsYXlCb3guYm9yZGVyQm90dG9tKCk7CiAgICAgICAgICAgICBib2R5QW5kRG9jdW1lbnRW ZXJ0aWNhbE1hcmdpblBhZGRpbmdBbmRCb3JkZXIgKz0gdmVydGljYWxNYXJnaW4uYmVmb3JlLnZh bHVlT3IoMCkgKyB2ZXJ0aWNhbE1hcmdpbi5hZnRlci52YWx1ZU9yKDApICsgdmVydGljYWxQYWRk aW5nICsgdmVydGljYWxCb3JkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKaW5kZXggZWY5YjFhMTdkZWYyZDg2NDE5ZjlkYTBiOWRhYmE5MjkxNDEyNjJl Yy4uYjhhZjE4ZjQ3ZDVkNzU5M2RkZTc0Y2I1YzljMDg4ZTdmNTI0MWIyZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMjc0LDcgKzI3NCw3IEBA IEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93 SGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJvCiAgICAgICAgIGhlaWdodEFuZE1hcmdpbiA9IGNvbXBs aWNhdGVkQ2FzZXMobGF5b3V0Qm94LCB1c2VkVmFsdWVzLCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7 CiAgICAgfQogCi0gICAgYXV0byBxdWlya3MgPSBRdWlya3MoZm9ybWF0dGluZ0NvbnRleHQoKSk7 CisgICAgYXV0byBxdWlya3MgPSBmb3JtYXR0aW5nQ29udGV4dCgpLnF1aXJrcygpOwogICAgIGlm ICghcXVpcmtzLm5lZWRzU3RyZXRjaGluZyhsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4gaGVp Z2h0QW5kTWFyZ2luOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNw cAppbmRleCA2NWQxMmY5MzlhZTVmZmI0MTg1MDQwNjE5NDQ0OTk3ZTdlYTkyMWE2Li4zZWQzZmY4 NzFmZmZlNjk3ODc4ZmVlMWExNzZkZTgxNTQ1YmE1NmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTgyLDcgKzgyLDcgQEAgSGVpZ2h0QW5kTWFyZ2lu IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6c3RyZXRjaGVkSW5GbG93SGVpZ2h0KGNv bnN0IEJveCYKICAgICAgICAgLy8gSGVyZSBpcyB0aGUgcXVpcmt5IHBhcnQgZm9yIGJvZHkgYm94 OgogICAgICAgICAvLyBTdHJldGNoIHRoZSBib2R5IHVzaW5nIHRoZSBpbml0aWFsIGNvbnRhaW5p bmcgYmxvY2sncyBoZWlnaHQgYW5kIHNocmluayBpdCB3aXRoIGRvY3VtZW50IGJveCdzIG1hcmdp bi9ib3JkZXIvcGFkZGluZy4KICAgICAgICAgLy8gVGhpcyBsb29rcyBleHRyZW1lbHkgb2RkIHdo ZW4gaHRtbCBoYXMgbm9uLWF1dG8gaGVpZ2h0LgotICAgICAgICBhdXRvIGRvY3VtZW50Qm94VmVy dGljYWxNYXJnaW4gPSBHZW9tZXRyeShmb3JtYXR0aW5nQ29udGV4dCkuY29tcHV0ZWRWZXJ0aWNh bE1hcmdpbihkb2N1bWVudEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgeyBpbml0aWFsQ29udGFp bmluZ0Jsb2NrRGlzcGxheUJveC5jb250ZW50Qm94V2lkdGgoKSB9KTsKKyAgICAgICAgYXV0byBk b2N1bWVudEJveFZlcnRpY2FsTWFyZ2luID0gZm9ybWF0dGluZ0NvbnRleHQuZ2VvbWV0cnkoKS5j b21wdXRlZFZlcnRpY2FsTWFyZ2luKGRvY3VtZW50Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7 IGluaXRpYWxDb250YWluaW5nQmxvY2tEaXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpIH0pOwog ICAgICAgICBzdHJlY2hlZEhlaWdodCAtPSAoZG9jdW1lbnRCb3hWZXJ0aWNhbE1hcmdpbi5iZWZv cmUudmFsdWVPcigwKSArIGRvY3VtZW50Qm94VmVydGljYWxNYXJnaW4uYWZ0ZXIudmFsdWVPcigw KSk7CiAKICAgICAgICAgYXV0byYgYm9keUJveERpc3BsYXlCb3ggPSBmb3JtYXR0aW5nQ29udGV4 dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNl LmNwcAppbmRleCA0OWIwZTdjNzJjNDRhNWJhNTVmOGVlYTY4OTU5NTg0ZDdkNmQ4ZmZkLi5jMDQ2 NzEwMTczNTE3OGUwYTI5MDFiYzFlMjAyYjdkMDk3ZTJmMzI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xs YXBzZS5jcHAKQEAgLTUxNSw3ICs1MTUsNyBAQCBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxN YXJnaW46OlZhbHVlcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZQogICAg IH0KICAgICAvLyBUaGlzIGlzIHRoZSBlc3RpbWF0ZSBwYXRoLiBXZSBkb24ndCB5ZXQgaGF2ZSBw b3NpdGl2ZS9uZWdhdGl2ZSBtYXJnaW4gY29tcHV0ZWQuCiAgICAgYXV0byB1c2VkVmFsdWVzID0g VXNlZEhvcml6b250YWxWYWx1ZXMgeyBmb3JtYXR0aW5nQ29udGV4dCgpLmRpc3BsYXlCb3hGb3JM YXlvdXRCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29udGVudEJveFdpZHRoKCkg fTsKLSAgICBhdXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeShmb3JtYXR0aW5n Q29udGV4dCgpKS5jb21wdXRlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwgdXNlZFZhbHVlcyk7 CisgICAgYXV0byBjb21wdXRlZFZlcnRpY2FsTWFyZ2luID0gZm9ybWF0dGluZ0NvbnRleHQoKS5n ZW9tZXRyeSgpLmNvbXB1dGVkVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkVmFsdWVzKTsK ICAgICBhdXRvIG5vbkNvbGxhcHNlZE1hcmdpbiA9IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29s bGFwc2VkVmFsdWVzIHsgY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5iZWZvcmUudmFsdWVPcigwKSwg Y29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5hZnRlci52YWx1ZU9yKDApIH07IAogCiAgICAgaWYgKG1h cmdpblR5cGUgPT0gTWFyZ2luVHlwZTo6QmVmb3JlKQpAQCAtNTQxLDcgKzU0MSw3IEBAIFBvc2l0 aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Ok1hcmdpbkNvbGxhcHNlCiAgICAgLy8gMi4gR2F0aGVyIHBvc2l0aXZlIGFuZCBuZWdhdGl2 ZSBtYXJnaW4gdmFsdWVzIGZyb20gcHJldmlvdXMgaW5mbG93IHNpYmxpbmcgaWYgbWFyZ2lucyBh cmUgYWRqb2luaW5nLgogICAgIC8vIDMuIENvbXB1dGUgbWluL21heCBwb3NpdGl2ZSBhbmQgbmVn YXRpdmUgY29sbGFwc2VkIG1hcmdpbiB2YWx1ZXMgdXNpbmcgbm9uLWNvbGxwYXNlZCBjb21wdXRl ZCBtYXJnaW4gYmVmb3JlLgogICAgIGF1dG8gY29sbGFwc2VkTWFyZ2luQmVmb3JlID0gY29tcHV0 ZWRQb3NpdGl2ZUFuZE5lZ2F0aXZlTWFyZ2luKGZpcnN0Q2hpbGRDb2xsYXBzZWRNYXJnaW5CZWZv cmUoKSwgcHJldmlvdVNpYmxpbmdDb2xsYXBzZWRNYXJnaW5BZnRlcigpKTsKLSAgICBpZiAoY29s bGFwc2VkTWFyZ2luQmVmb3JlLmlzUXVpcmsgJiYgUXVpcmtzKGZvcm1hdHRpbmdDb250ZXh0KCkp LnNob3VsZElnbm9yZUNvbGxhcHNlZFF1aXJrTWFyZ2luKGxheW91dEJveCkpCisgICAgaWYgKGNv bGxhcHNlZE1hcmdpbkJlZm9yZS5pc1F1aXJrICYmIGZvcm1hdHRpbmdDb250ZXh0KCkucXVpcmtz KCkuc2hvdWxkSWdub3JlQ29sbGFwc2VkUXVpcmtNYXJnaW4obGF5b3V0Qm94KSkKICAgICAgICAg Y29sbGFwc2VkTWFyZ2luQmVmb3JlID0geyB9OwogCiAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZl cnRpY2FsTWFyZ2luOjpWYWx1ZXMgbm9uQ29sbGFwc2VkQmVmb3JlOwpAQCAtNTgzLDcgKzU4Myw3 IEBAIEVzdGltYXRlZE1hcmdpbkJlZm9yZSBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5D b2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmCiAgICAgQVNTRVJUKCFsYXlvdXRCb3gucmVwbGFj ZWQoKSk7CiAKICAgICBhdXRvIHVzZWRWYWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IGZv cm1hdHRpbmdDb250ZXh0KCkuZGlzcGxheUJveEZvckxheW91dEJveCgqbGF5b3V0Qm94LmNvbnRh aW5pbmdCbG9jaygpKS5jb250ZW50Qm94V2lkdGgoKSB9OwotICAgIGF1dG8gY29tcHV0ZWRWZXJ0 aWNhbE1hcmdpbiA9IEdlb21ldHJ5KGZvcm1hdHRpbmdDb250ZXh0KCkpLmNvbXB1dGVkVmVydGlj YWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkVmFsdWVzKTsKKyAgICBhdXRvIGNvbXB1dGVkVmVydGlj YWxNYXJnaW4gPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5KCkuY29tcHV0ZWRWZXJ0aWNh bE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOwogICAgIGF1dG8gbm9uQ29sbGFwc2VkTWFy Z2luID0gVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMgeyBjb21wdXRlZFZl cnRpY2FsTWFyZ2luLmJlZm9yZS52YWx1ZU9yKDApLCBjb21wdXRlZFZlcnRpY2FsTWFyZ2luLmFm dGVyLnZhbHVlT3IoMCkgfTsKICAgICBhdXRvIG1hcmdpbnNDb2xsYXBzZVRocm91Z2ggPSB0aGlz LT5tYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGxheW91dEJveCk7CiAgICAgYXV0byBwb3NpdGl2ZU5l Z2F0aXZlTWFyZ2luQmVmb3JlID0gdGhpcy0+cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZShs YXlvdXRCb3gsIG5vbkNvbGxhcHNlZE1hcmdpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlv dXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAppbmRleCA5NmYzMTgxZTRlMTBjZTg3OWQwZDY5 Nzk5ZjUxZDU2MzI3NzZmZGQzLi5mYmNjMWIzNzNkYjBiM2Q4ZTI4MzI4OTczMGEwMWEwZmNjMTYx ZjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91 dC5jcHAKQEAgLTMyNCw3ICszMjQsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpJ bmxpbmVMYXlvdXQ6OmxheW91dChjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbQogICAgIH07 CiAKICAgICBJbmRleEFuZFJhbmdlIGN1cnJlbnRJbmxpbmVJdGVtOwotICAgIGF1dG8gcXVpcmtz ID0gUXVpcmtzKGZvcm1hdHRpbmdDb250ZXh0KTsKKyAgICBhdXRvIHF1aXJrcyA9IGZvcm1hdHRp bmdDb250ZXh0LnF1aXJrcygpOwogICAgIHdoaWxlIChjdXJyZW50SW5saW5lSXRlbS5pbmRleCA8 IGlubGluZUl0ZW1zLnNpemUoKSkgewogICAgICAgICBhdXRvIGxpbmVJbnB1dCA9IExpbmVJbnB1 dCB7IHsgeyBsaW5lTG9naWNhbExlZnQsIGxpbmVMb2dpY2FsVG9wIH0sIHdpZHRoQ29uc3RyYWlu dCwgcXVpcmtzLmxpbmVIZWlnaHRDb25zdHJhaW50cyhmb3JtYXR0aW5nUm9vdCkgfSwgTGluZTo6 U2tpcFZlcnRpY2FsQWxpZ21lbnQ6Ok5vLCBjdXJyZW50SW5saW5lSXRlbSwgaW5saW5lSXRlbXMg fTsKICAgICAgICAgYXBwbHlGbG9hdENvbnN0cmFpbnQobGluZUlucHV0KTsKQEAgLTM0Nyw3ICsz NDcsNyBAQCBMYXlvdXRVbml0IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6 OmNvbXB1dGVkSW50cmluc2ljV2lkdGgoY29uc3QgSQogICAgIGF1dG8mIGZvcm1hdHRpbmdDb250 ZXh0ID0gdGhpcy0+Zm9ybWF0dGluZ0NvbnRleHQoKTsKICAgICBMYXlvdXRVbml0IG1heGltdW1M aW5lV2lkdGg7CiAgICAgSW5kZXhBbmRSYW5nZSBjdXJyZW50SW5saW5lSXRlbTsKLSAgICBhdXRv IHF1aXJrcyA9IFF1aXJrcyhmb3JtYXR0aW5nQ29udGV4dCk7CisgICAgYXV0byBxdWlya3MgPSBm b3JtYXR0aW5nQ29udGV4dC5xdWlya3MoKTsKICAgICB3aGlsZSAoY3VycmVudElubGluZUl0ZW0u aW5kZXggPCBpbmxpbmVJdGVtcy5zaXplKCkpIHsKICAgICAgICAgYXV0byBsaW5lQ29udGVudCA9 IExpbmVMYXlvdXQoZm9ybWF0dGluZ0NvbnRleHQsIHsgeyB7IH0sIHdpZHRoQ29uc3RyYWludCwg cXVpcmtzLmxpbmVIZWlnaHRDb25zdHJhaW50cyhmb3JtYXR0aW5nUm9vdCgpKSB9LCBMaW5lOjpT a2lwVmVydGljYWxBbGlnbWVudDo6WWVzLCBjdXJyZW50SW5saW5lSXRlbSwgaW5saW5lSXRlbXMg fSkubGF5b3V0KCk7CiAgICAgICAgIGN1cnJlbnRJbmxpbmVJdGVtID0geyBsaW5lQ29udGVudC5s YXN0Q29tbWl0dGVkLT5pbmRleCArIDEsIFdURjo6bnVsbG9wdCB9OwpAQCAtMzkzLDcgKzM5Myw3 IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OklubGluZUxheW91dDo6Y3JlYXRlRGlz cGxheVJ1bnMoY29uc3QgTGluZTo6Q29udGVuCiAgICAgYXV0byBsaW5lQm94UmVjdCA9IERpc3Bs YXk6OlJlY3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wKCksIGxpbmVDb250ZW50LmxvZ2ljYWxM ZWZ0KCksIDAsIGxpbmVDb250ZW50LmxvZ2ljYWxIZWlnaHQoKX07CiAgICAgLy8gQ3JlYXRlIGZp bmFsIGRpc3BsYXkgcnVucy4KICAgICBhdXRvJiBsaW5lUnVucyA9IGxpbmVDb250ZW50LnJ1bnMo KTsKLSAgICBhdXRvIGdlb21ldHJ5ID0gR2VvbWV0cnkoZm9ybWF0dGluZ0NvbnRleHQpOworICAg IGF1dG8gZ2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeSgpOwogICAgIGZvciAo dW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IGxpbmVSdW5zLnNpemUoKTsgKytpbmRleCkgewog ICAgICAgICBhdXRvJiBsaW5lUnVuID0gbGluZVJ1bnMuYXQoaW5kZXgpOwogICAgICAgICBhdXRv JiBsb2dpY2FsUmVjdCA9IGxpbmVSdW4tPmxvZ2ljYWxSZWN0KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IGNm ZWI4ZDM0YWE3YjhjMmE3NGE0NWNmMGM1MWY0Zjc3MzAyMzkxZDIuLmVlOTU1MTlmMjliM2NiZTMx Njk2MGM2YzEyOGViYzM2YzZhMTM0YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAg c3RkOjp1bmlxdWVfcHRyPExpbmU6OkNvbnRlbnQ+IExpbmU6OmNsb3NlKCkKICAgICAgICAgfQog CiAgICAgICAgIC8vIFJlbW92ZSBkZXNjZW50IHdoZW4gYWxsIGNvbnRlbnQgaXMgYmFzZWxpbmUg YWxpZ25lZCBidXQgbm9uZSBvZiB0aGVtIGhhdmUgZGVzY2VudC4KLSAgICAgICAgaWYgKElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3MoZm9ybWF0dGluZ0NvbnRleHQoKSkubGluZURlc2Nl bnROZWVkc0NvbGxhcHNpbmcoKm1fY29udGVudCkpIHsKKyAgICAgICAgaWYgKGZvcm1hdHRpbmdD b250ZXh0KCkucXVpcmtzKCkubGluZURlc2NlbnROZWVkc0NvbGxhcHNpbmcoKm1fY29udGVudCkp IHsKICAgICAgICAgICAgIG1fbGluZUxvZ2ljYWxIZWlnaHQgLT0gbV9iYXNlbGluZS5kZXNjZW50 OwogICAgICAgICAgICAgbV9iYXNlbGluZS5kZXNjZW50ID0geyB9OwogICAgICAgICB9Cg==