223248 2021-03-16 03:59:49 -0700 Apply permission policy to geolocation 2021-03-31 04:16:20 -0700 1 1 1 Unclassified WebKit DOM WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen benjamin cdumez changseok eric.carlson esprehn+autocc ews-watchlist gyuyoung.kim webkit-bug-importer oldest_to_newest 1739892 0 youennf 2021-03-16 03:59:49 -0700 Apply permission policy to geolocation 1739894 1 423316 youennf 2021-03-16 04:02:52 -0700 Created attachment 423316 Patch 1739934 2 423328 youennf 2021-03-16 07:45:16 -0700 Created attachment 423328 Patch 1740727 3 423328 eric.carlson 2021-03-17 09:20:10 -0700 Comment on attachment 423328 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423328&action=review > Source/WebCore/Modules/geolocation/Geolocation.cpp:358 > + if (!isFeaturePolicyAllowedByDocumentAndAllOwners(FeaturePolicy::Type::Geolocation, *document(), LogFeaturePolicyFailure::Yes)) > + return true; As we discussed, I think a linked-on-or-after check would be a good idea so we don't break existing apps that depend on the old behavior. 1742747 4 youennf 2021-03-23 03:51:19 -0700 > As we discussed, I think a linked-on-or-after check would be a good idea so > we don't break existing apps that depend on the old behavior. If we add a linked-on-or-after check here, we probably need to do the same when computing the origin shown on the geolocation prompt. We can probably do that, but maybe we can try to land this change and use linked-on-or-after if we see breakage? 1742753 5 webkit-bug-importer 2021-03-23 04:00:53 -0700 <rdar://problem/75732512> 1745090 6 ews-feeder 2021-03-30 05:27:55 -0700 Tools/Scripts/svn-apply failed to apply attachment 423328 to trunk. Please resolve the conflicts and upload a new patch. 1745113 7 424637 youennf 2021-03-30 07:43:22 -0700 Created attachment 424637 Patch for landing 1745580 8 ews-feeder 2021-03-31 04:16:18 -0700 Committed r275276: <https://commits.webkit.org/r275276> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424637. 423316 2021-03-16 04:02:52 -0700 2021-03-16 07:45:10 -0700 Patch bug-223248-20210316120250.patch text/plain 14106 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZiMmJhODZmYzViMDA3 NjQwZGQxMDg3NGYzZmYyMWM5YjllMDdmMi4uZDdkY2U2YTJiZjM1NjJkMWJlZTQyZDIwYjlkZTUy NjFlNjkzY2JhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAzLTE2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBcHBseSBwZXJtaXNzaW9u IHBvbGljeSB0byBnZW9sb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIzMjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgT25seSBhbGxvdyB0aGlyZC1wYXJ0eSBpZnJhbWVzIGlmIGFsbG93ZWQg YnkgcGVybWlzc2lvbiBwb2xpY3ksCisgICAgICAgIGZvbGxvd2luZyBodHRwczovL3czYy5naXRo dWIuaW8vZ2VvbG9jYXRpb24tYXBpLyNwZXJtaXNzaW9ucy1wb2xpY3kuCisgICAgICAgIENvdmVy ZWQgYnkgQVBJIHRlc3RzLgorCisgICAgICAgICogTW9kdWxlcy9nZW9sb2NhdGlvbi9HZW9sb2Nh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6c2hvdWxkQmxvY2tHZW9s b2NhdGlvblJlcXVlc3RzKToKKyAgICAgICAgKiBodG1sL0ZlYXR1cmVQb2xpY3kuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6cG9saWN5VHlwZU5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6RmVhdHVy ZVBvbGljeTo6cGFyc2UpOgorICAgICAgICAoV2ViQ29yZTo6RmVhdHVyZVBvbGljeTo6YWxsb3dz IGNvbnN0KToKKyAgICAgICAgKiBodG1sL0ZlYXR1cmVQb2xpY3kuaDoKKwogMjAyMS0wMy0xNiAg TGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbU09VUF0gRml4IFNP VVAzIGRlYnVnIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2dlb2xv Y2F0aW9uL0dlb2xvY2F0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRp b24vR2VvbG9jYXRpb24uY3BwCmluZGV4IDZkNWJlOWE1OTFhMjcyY2Q2N2Q2ZTlkMDk3YjMwNTA1 YmRmOGFlNWUuLjhkN2M3ZDNmN2QzYzQ4NTM0Y2E2NTBlZTk3YmEzMzQ3OTExZTM4ZjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb24uY3Bw CkBAIC0zMSw2ICszMSw3IEBACiAjaWYgRU5BQkxFKEdFT0xPQ0FUSU9OKQogCiAjaW5jbHVkZSAi RG9jdW1lbnQuaCIKKyNpbmNsdWRlICJGZWF0dXJlUG9saWN5LmgiCiAjaW5jbHVkZSAiRnJhbWUu aCIKICNpbmNsdWRlICJHZW9Ob3RpZmllci5oIgogI2luY2x1ZGUgIkdlb2xvY2F0aW9uQ29udHJv bGxlci5oIgpAQCAtMzUzLDYgKzM1NCw5IEBAIHN0YXRpYyBib29sIGlzUmVxdWVzdEZyb21JQm9v a3MoKQogICAgIAogYm9vbCBHZW9sb2NhdGlvbjo6c2hvdWxkQmxvY2tHZW9sb2NhdGlvblJlcXVl c3RzKCkKIHsKKyAgICBpZiAoIWlzRmVhdHVyZVBvbGljeUFsbG93ZWRCeURvY3VtZW50QW5kQWxs T3duZXJzKEZlYXR1cmVQb2xpY3k6OlR5cGU6Okdlb2xvY2F0aW9uLCAqZG9jdW1lbnQoKSwgTG9n RmVhdHVyZVBvbGljeUZhaWx1cmU6OlllcykpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAg Ym9vbCBpc1NlY3VyZSA9IFNlY3VyaXR5T3JpZ2luOjppc1NlY3VyZShkb2N1bWVudCgpLT51cmwo KSk7CiAgICAgYm9vbCBoYXNNaXhlZENvbnRlbnQgPSAhZG9jdW1lbnQoKS0+Zm91bmRNaXhlZENv bnRlbnQoKS5pc0VtcHR5KCk7CiAgICAgYm9vbCBpc0xvY2FsT3JpZ2luID0gc2VjdXJpdHlPcmln aW4oKS0+aXNMb2NhbCgpOwpAQCAtMzYwLDcgKzM2NCw3IEBAIGJvb2wgR2VvbG9jYXRpb246OnNo b3VsZEJsb2NrR2VvbG9jYXRpb25SZXF1ZXN0cygpCiAgICAgICAgIGlmIChpc0xvY2FsT3JpZ2lu IHx8IChpc1NlY3VyZSAmJiAhaGFzTWl4ZWRDb250ZW50KSB8fCBpc1JlcXVlc3RGcm9tSUJvb2tz KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIAorCiAgICAgbG9nRXJy b3Ioc2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKSwgaXNTZWN1cmUsIGhhc01peGVkQ29udGVu dCwgZG9jdW1lbnQoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0ZlYXR1cmVQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9GZWF0 dXJlUG9saWN5LmNwcAppbmRleCBlNTM5ZDZkNTJmZTM1NTM4M2EyNmM5NmI1YWNmNDQ5MTBlYjI1 NjgwLi44MzJhYmJhYTdmM2NkNzJkOWI4YTI4NmE4ZmU5MDc5MDNkNThkMjhkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZlYXR1cmVQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvRmVhdHVyZVBvbGljeS5jcHAKQEAgLTQ4LDYgKzQ4LDggQEAgc3RhdGljIGNvbnN0 IGNoYXIqIHBvbGljeVR5cGVOYW1lKEZlYXR1cmVQb2xpY3k6OlR5cGUgdHlwZSkKICAgICAgICAg cmV0dXJuICJTcGVha2VyU2VsZWN0aW9uIjsKICAgICBjYXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6 OkRpc3BsYXlDYXB0dXJlOgogICAgICAgICByZXR1cm4gIkRpc3BsYXlDYXB0dXJlIjsKKyAgICBj YXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6Okdlb2xvY2F0aW9uOgorICAgICAgICByZXR1cm4gIkdl b2xvY2F0aW9uIjsKICAgICBjYXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6OlN5bmNYSFI6CiAgICAg ICAgIHJldHVybiAiU3luY1hIUiI7CiAgICAgY2FzZSBGZWF0dXJlUG9saWN5OjpUeXBlOjpGdWxs c2NyZWVuOgpAQCAtMTY3LDYgKzE2OSw3IEBAIEZlYXR1cmVQb2xpY3kgRmVhdHVyZVBvbGljeTo6 cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBIVE1MSUZyYW1lRWxlbWVudCYKICAgICBi b29sIGlzTWljcm9waG9uZUluaXRpYWxpemVkID0gZmFsc2U7CiAgICAgYm9vbCBpc1NwZWFrZXJT ZWxlY3Rpb25Jbml0aWFsaXplZCA9IGZhbHNlOwogICAgIGJvb2wgaXNEaXNwbGF5Q2FwdHVyZUlu aXRpYWxpemVkID0gZmFsc2U7CisgICAgYm9vbCBpc0dlb2xvY2F0aW9uSW5pdGlhbGl6ZWQgPSBm YWxzZTsKICAgICBib29sIGlzU3luY1hIUkluaXRpYWxpemVkID0gZmFsc2U7CiAgICAgYm9vbCBp c0Z1bGxzY3JlZW5Jbml0aWFsaXplZCA9IGZhbHNlOwogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5U QVRJT04pCkBAIC0xOTksNiArMjAyLDExIEBAIEZlYXR1cmVQb2xpY3kgRmVhdHVyZVBvbGljeTo6 cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBIVE1MSUZyYW1lRWxlbWVudCYKICAgICAg ICAgICAgIHVwZGF0ZUxpc3QoZG9jdW1lbnQsIHBvbGljeS5tX2Rpc3BsYXlDYXB0dXJlUnVsZSwg aXRlbS5zdWJzdHJpbmcoMTYpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Cisg ICAgICAgIGlmIChpdGVtLnN0YXJ0c1dpdGgoImdlb2xvY2F0aW9uIikpIHsKKyAgICAgICAgICAg IGlzR2VvbG9jYXRpb25Jbml0aWFsaXplZCA9IHRydWU7CisgICAgICAgICAgICB1cGRhdGVMaXN0 KGRvY3VtZW50LCBwb2xpY3kubV9nZW9sb2NhdGlvblJ1bGUsIGl0ZW0uc3Vic3RyaW5nKDEyKSk7 CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAoaXRlbS5zdGFy dHNXaXRoKCJzeW5jLXhociIpKSB7CiAgICAgICAgICAgICBpc1N5bmNYSFJJbml0aWFsaXplZCA9 IHRydWU7CiAgICAgICAgICAgICB1cGRhdGVMaXN0KGRvY3VtZW50LCBwb2xpY3kubV9zeW5jWEhS UnVsZSwgaXRlbS5zdWJzdHJpbmcoOSkpOwpAQCAtMjQ0LDYgKzI1Miw4IEBAIEZlYXR1cmVQb2xp Y3kgRmVhdHVyZVBvbGljeTo6cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBIVE1MSUZy YW1lRWxlbWVudCYKICAgICAgICAgcG9saWN5Lm1fc3BlYWtlclNlbGVjdGlvblJ1bGUuYWxsb3dl ZExpc3QuYWRkKGRvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuZGF0YSgpKTsKICAgICBpZiAoIWlz RGlzcGxheUNhcHR1cmVJbml0aWFsaXplZCkKICAgICAgICAgcG9saWN5Lm1fZGlzcGxheUNhcHR1 cmVSdWxlLmFsbG93ZWRMaXN0LmFkZChkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSk7 CisgICAgaWYgKCFpc0dlb2xvY2F0aW9uSW5pdGlhbGl6ZWQpCisgICAgICAgIHBvbGljeS5tX2dl b2xvY2F0aW9uUnVsZS5hbGxvd2VkTGlzdC5hZGQoZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKS5k YXRhKCkpOwogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCiAgICAgaWYgKCFpc0d5cm9z Y29wZUluaXRpYWxpemVkKQogICAgICAgICBwb2xpY3kubV9neXJvc2NvcGVSdWxlLmFsbG93ZWRM aXN0LmFkZChkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSk7CkBAIC0yODksNiArMjk5 LDggQEAgYm9vbCBGZWF0dXJlUG9saWN5OjphbGxvd3MoVHlwZSB0eXBlLCBjb25zdCBTZWN1cml0 eU9yaWdpbkRhdGEmIG9yaWdpbikgY29uc3QKICAgICAgICAgcmV0dXJuIGlzQWxsb3dlZEJ5RmVh dHVyZVBvbGljeShtX3NwZWFrZXJTZWxlY3Rpb25SdWxlLCBvcmlnaW4pOwogICAgIGNhc2UgVHlw ZTo6RGlzcGxheUNhcHR1cmU6CiAgICAgICAgIHJldHVybiBpc0FsbG93ZWRCeUZlYXR1cmVQb2xp Y3kobV9kaXNwbGF5Q2FwdHVyZVJ1bGUsIG9yaWdpbik7CisgICAgY2FzZSBUeXBlOjpHZW9sb2Nh dGlvbjoKKyAgICAgICAgcmV0dXJuIGlzQWxsb3dlZEJ5RmVhdHVyZVBvbGljeShtX2dlb2xvY2F0 aW9uUnVsZSwgb3JpZ2luKTsKICAgICBjYXNlIFR5cGU6OlN5bmNYSFI6CiAgICAgICAgIHJldHVy biBpc0FsbG93ZWRCeUZlYXR1cmVQb2xpY3kobV9zeW5jWEhSUnVsZSwgb3JpZ2luKTsKICAgICBj YXNlIFR5cGU6OkZ1bGxzY3JlZW46CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zl YXR1cmVQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGljeS5oCmluZGV4 IGVlZGU4ZjE5NzcyMDMxZTEwYjljNGQyOTM4NGIzZDUwYThjN2E5YWMuLjdiNjQ1NjE3MTY1ZjQw MWNlM2JiODAxZDMyMDIwOTU4NzUyMWI2ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvRmVhdHVyZVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGlj eS5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAgICAgICAgTWljcm9waG9uZSwKICAgICAg ICAgU3BlYWtlclNlbGVjdGlvbiwKICAgICAgICAgRGlzcGxheUNhcHR1cmUsCisgICAgICAgIEdl b2xvY2F0aW9uLAogICAgICAgICBTeW5jWEhSLAogICAgICAgICBGdWxsc2NyZWVuLAogI2lmIEVO QUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCkBAIC02Nyw2ICs2OCw3IEBAIHByaXZhdGU6CiAgICAg QWxsb3dSdWxlIG1fbWljcm9waG9uZVJ1bGU7CiAgICAgQWxsb3dSdWxlIG1fc3BlYWtlclNlbGVj dGlvblJ1bGU7CiAgICAgQWxsb3dSdWxlIG1fZGlzcGxheUNhcHR1cmVSdWxlOworICAgIEFsbG93 UnVsZSBtX2dlb2xvY2F0aW9uUnVsZTsKICAgICBBbGxvd1J1bGUgbV9zeW5jWEhSUnVsZTsKICAg ICBBbGxvd1J1bGUgbV9mdWxsc2NyZWVuUnVsZTsKICNpZiBFTkFCTEUoREVWSUNFX09SSUVOVEFU SU9OKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDU2MjQzN2U2N2M5YmFmZDBkNjA2N2Q3NTZiYmEyZDFlOTFkYjA2YjMuLjI2MzU5MzM1YmU3YWQ5 OGQ5NDM2ZjU2MTY5OGU3YThjMzI5ZGMwMjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wMy0xNiAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgQXBwbHkgcGVybWlzc2lvbiBw b2xpY3kgdG8gZ2VvbG9jYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMzI0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRl Lm1tOgorICAgICAgICAoLVtHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IHNldFZhbGlkYXRpb25IYW5k bGVyOl0pOgorICAgICAgICAoLVtHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IF93ZWJWaWV3OnJlcXVl c3RHZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JPcmlnaW46aW5pdGlhdGVkQnlGcmFtZTpkZWNpc2lv bkhhbmRsZXI6XSk6CisgICAgICAgICgtW0dlb2xvY2F0aW9uUGVybWlzc2lvbk1lc3NhZ2VIYW5k bGVyIHVzZXJDb250ZW50Q29udHJvbGxlcjpkaWRSZWNlaXZlU2NyaXB0TWVzc2FnZTpdKToKKwog MjAyMS0wMy0xNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAg QWxpZ24gZGV2aWNlIG9yaWVudGF0aW9uIGRlbGVnYXRlIHRvIGdldFVzZXJNZWRpYS9nZW9sb2Nh dGlvbiBkZWxlZ2F0ZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvVUlEZWxlZ2F0ZS5tbQppbmRleCAxN2M1MmY0OTgxMjU2Nzg2MWYwOTFmMDQ3NzU1MzU2 MDFjMjQwZTkwLi5iNjg0M2NjNDk0NGRkODljMGViNDdkNjU0ZjBiMDEzZTRiMGU4NDVlIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVsZWdhdGUu bW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRl Lm1tCkBAIC00OCw2ICs0OCw3IEBACiAjZW5kaWYKIAogc3RhdGljIGJvb2wgZG9uZTsKK3N0YXRp YyBib29sIGRpZFJlY2VpdmVNZXNzYWdlOwogCiBAaW50ZXJmYWNlIEF1ZGlvT2JzZXJ2ZXIgOiBO U09iamVjdAogQGVuZApAQCAtMTczLDMzICsxNzQsNDMgQEAgVEVTVChXZWJLaXQsIEdlb2xvY2F0 aW9uUGVybWlzc2lvbikKIH0KIAogQGludGVyZmFjZSBHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IDog TlNPYmplY3QgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+CistICh2b2lkKXNldFZhbGlkYXRpb25IYW5k bGVyOihGdW5jdGlvbjx2b2lkKFdLU2VjdXJpdHlPcmlnaW4qLCBXS0ZyYW1lSW5mbyopPiYmKXZh bGlkYXRpb25IYW5kbGVyOwogQGVuZAogCi1AaW1wbGVtZW50YXRpb24gR2VvbG9jYXRpb25EZWxl Z2F0ZU5ldwotLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyByZXF1ZXN0R2Vv bG9jYXRpb25QZXJtaXNzaW9uRm9yT3JpZ2luOihXS1NlY3VyaXR5T3JpZ2luKilvcmlnaW4gaW5p dGlhdGVkQnlGcmFtZTooV0tGcmFtZUluZm8gKilmcmFtZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQg KF4pKF9XS1Blcm1pc3Npb25EZWNpc2lvbiBkZWNpc2lvbikpZGVjaXNpb25IYW5kbGVyIHsKLSAg ICBFWFBFQ1RfV0tfU1RSRVEob3JpZ2luLnByb3RvY29sLCBAImh0dHBzIik7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKG9yaWdpbi5ob3N0LCBAIjEyNy4wLjAuMSIpOwotICAgIEVYUEVDVF9FUShvcmln aW4ucG9ydCwgOTA5MCk7CitAaW1wbGVtZW50YXRpb24gR2VvbG9jYXRpb25EZWxlZ2F0ZU5ldyB7 CisgICAgRnVuY3Rpb248dm9pZChXS1NlY3VyaXR5T3JpZ2luKiwgV0tGcmFtZUluZm8qKT4gX3Zh bGlkYXRpb25IYW5kbGVyOworfQorLSAodm9pZClzZXRWYWxpZGF0aW9uSGFuZGxlcjooRnVuY3Rp b248dm9pZChXS1NlY3VyaXR5T3JpZ2luKiwgV0tGcmFtZUluZm8qKT4mJil2YWxpZGF0aW9uSGFu ZGxlciB7CisgICAgX3ZhbGlkYXRpb25IYW5kbGVyID0gV1RGTW92ZSh2YWxpZGF0aW9uSGFuZGxl cik7Cit9CiAKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4ucHJvdG9j b2wsIEAiaHR0cHMiKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4u aG9zdCwgQCIxMjcuMC4wLjEiKTsKLSAgICBFWFBFQ1RfRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4u cG9ydCwgOTA5MSk7Ci0gICAgRVhQRUNUX0ZBTFNFKGZyYW1lLmlzTWFpbkZyYW1lKTsKLSAgICBF WFBFQ1RfVFJVRShmcmFtZS53ZWJWaWV3ID09IHdlYlZpZXcpOworLSAodm9pZClfd2ViVmlldzoo V0tXZWJWaWV3ICopd2ViVmlldyByZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNzaW9uRm9yT3JpZ2lu OihXS1NlY3VyaXR5T3JpZ2luKilvcmlnaW4gaW5pdGlhdGVkQnlGcmFtZTooV0tGcmFtZUluZm8g KilmcmFtZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS1Blcm1pc3Npb25EZWNpc2lvbiBk ZWNpc2lvbikpZGVjaXNpb25IYW5kbGVyIHsKKyAgICBpZiAoX3ZhbGlkYXRpb25IYW5kbGVyKQor ICAgICAgICBfdmFsaWRhdGlvbkhhbmRsZXIob3JpZ2luLCBmcmFtZSk7CiAKICAgICBkb25lICA9 IHRydWU7CiAgICAgZGVjaXNpb25IYW5kbGVyKF9XS1Blcm1pc3Npb25EZWNpc2lvbkdyYW50KTsK IH0KIEBlbmQKIAorQGludGVyZmFjZSBHZW9sb2NhdGlvblBlcm1pc3Npb25NZXNzYWdlSGFuZGxl ciA6IE5TT2JqZWN0IDxXS1NjcmlwdE1lc3NhZ2VIYW5kbGVyPgorQGVuZAorCitAaW1wbGVtZW50 YXRpb24gR2VvbG9jYXRpb25QZXJtaXNzaW9uTWVzc2FnZUhhbmRsZXIKKy0gKHZvaWQpdXNlckNv bnRlbnRDb250cm9sbGVyOihXS1VzZXJDb250ZW50Q29udHJvbGxlciAqKXVzZXJDb250ZW50Q29u dHJvbGxlciBkaWRSZWNlaXZlU2NyaXB0TWVzc2FnZTooV0tTY3JpcHRNZXNzYWdlICopbWVzc2Fn ZQoreworICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gdHJ1ZTsKK30KK0BlbmQKKwogc3RhdGljIGNv bnN0IGNoYXIqIG1haW5GcmFtZVRleHQgPSBSIkRPQ0RPQ0RPQygKIDxodG1sPjxib2R5PgotPGlm cmFtZSBzcmM9J2h0dHBzOi8vMTI3LjAuMC4xOjkwOTEvZnJhbWUnIGFsbG93PSdjYW1lcmE6aHR0 cHM6Ly8xMjcuMC4wLjE6OTA5MSc+PC9pZnJhbWU+Cis8aWZyYW1lIHNyYz0naHR0cHM6Ly8xMjcu MC4wLjE6OTA5MS9mcmFtZScgYWxsb3c9J2dlb2xvY2F0aW9uOmh0dHBzOi8vMTI3LjAuMC4xOjkw OTEnPjwvaWZyYW1lPgogPC9ib2R5PjwvaHRtbD4KIClET0NET0NET0MiOwogc3RhdGljIGNvbnN0 IGNoYXIqIGZyYW1lVGV4dCA9IFIiRE9DRE9DRE9DKAogPGh0bWw+PGJvZHk+PHNjcmlwdD4KLW5h dmlnYXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oKCkgPT4geyB9KTsKK25hdmln YXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oKCkgPT4geyB3ZWJraXQubWVzc2Fn ZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCJvayIpIH0sICgpID0+IHsgd2Via2l0 Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgia28iKSB9KTsKIDwvc2Ny aXB0PjwvYm9keT48L2h0bWw+CiApRE9DRE9DRE9DIjsKIApAQCAtMjI1LDEwICsyMzYsMTQgQEAg VEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lvbkluSUZyYW1lKQogCiAgICAgYXV0byBj b25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGlu aXRdKTsKICAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29sID0gcG9vbC5nZXQoKTsK KworICAgIGF1dG8gbWVzc2FnZUhhbmRsZXIgPSBhZG9wdE5TKFtbR2VvbG9jYXRpb25QZXJtaXNz aW9uTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gdXNl ckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxl ci5nZXQoKSBuYW1lOkAidGVzdEhhbmRsZXIiXTsKKwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0 TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwg ODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogCi0gICAgYXV0 byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IGFsbG9jXSBpbml0 XSk7Ci0gICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisgICAgYXV0 byBwZXJtaXNzaW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbR2VvbG9jYXRpb25EZWxlZ2F0ZU5ldyBh bGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6cGVybWlzc2lvbkRlbGVn YXRlLmdldCgpXTsKIAogICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbVGVz dE5hdmlnYXRpb25EZWxlZ2F0ZSBuZXddKTsKICAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHNldERp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpeKFdLV2ViVmlldyAqLCBOU1VSTEF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlICpjaGFsbGVuZ2UsIHZvaWQgKF5jYWxsYmFjaykoTlNVUkxTZXNz aW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uLCBOU1VSTENyZWRlbnRpYWwgKikpIHsKQEAgLTIz Nyw4ICsyNTIsNzQgQEAgVEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lvbkluSUZyYW1l KQogICAgIH1dOwogICAgIHdlYlZpZXcuZ2V0KCkubmF2aWdhdGlvbkRlbGVnYXRlID0gbmF2aWdh dGlvbkRlbGVnYXRlLmdldCgpOwogCisgICAgW3Blcm1pc3Npb25EZWxlZ2F0ZSBzZXRWYWxpZGF0 aW9uSGFuZGxlcjpbJndlYlZpZXddKFdLU2VjdXJpdHlPcmlnaW4gKm9yaWdpbiwgV0tGcmFtZUlu Zm8gKmZyYW1lKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShvcmlnaW4ucHJvdG9jb2wsIEAi aHR0cHMiKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKG9yaWdpbi5ob3N0LCBAIjEyNy4wLjAu MSIpOworICAgICAgICBFWFBFQ1RfRVEob3JpZ2luLnBvcnQsIDkwOTApOworCisgICAgICAgIEVY UEVDVF9XS19TVFJFUShmcmFtZS5zZWN1cml0eU9yaWdpbi5wcm90b2NvbCwgQCJodHRwcyIpOwor ICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4uaG9zdCwgQCIxMjcu MC4wLjEiKTsKKyAgICAgICAgRVhQRUNUX0VRKGZyYW1lLnNlY3VyaXR5T3JpZ2luLnBvcnQsIDkw OTEpOworICAgICAgICBFWFBFQ1RfRkFMU0UoZnJhbWUuaXNNYWluRnJhbWUpOworICAgICAgICBF WFBFQ1RfVFJVRShmcmFtZS53ZWJWaWV3ID09IHdlYlZpZXcpOworICAgIH1dOworCisgICAgZG9u ZSA9IGZhbHNlOworICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gZmFsc2U7CiAgICAgW3dlYlZpZXcg bG9hZFJlcXVlc3Q6c2VydmVyMS5yZXF1ZXN0KCldOwotICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6 OnJ1bigmZG9uZSk7CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRSZWNlaXZlTWVz c2FnZSk7CisgICAgRVhQRUNUX1RSVUUoZG9uZSk7Cit9CisKK3N0YXRpYyBjb25zdCBjaGFyKiBu b3RBbGxvd2luZ01haW5GcmFtZVRleHQgPSBSIkRPQ0RPQ0RPQygKKzxodG1sPjxib2R5PgorPGlm cmFtZSBzcmM9J2h0dHBzOi8vMTI3LjAuMC4xOjkwOTEvZnJhbWUnIGFsbG93PSdnZW9sb2NhdGlv bjpodHRwczovLzEyNy4wLjAuMTo5MDkyJz48L2lmcmFtZT4KKzwvYm9keT48L2h0bWw+CispRE9D RE9DRE9DIjsKKworVEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lvbkluRGlzYWxsb3dl ZElGcmFtZSkKK3sKKyAgICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNlcnZlcjEoeworICAg ICAgICB7ICIvIiwgeyBub3RBbGxvd2luZ01haW5GcmFtZVRleHQgfSB9CisgICAgfSwgVGVzdFdl YktpdEFQSTo6SFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzLCBudWxscHRyLCBudWxscHRyLCA5 MDkwKTsKKworICAgIFRlc3RXZWJLaXRBUEk6OkhUVFBTZXJ2ZXIgc2VydmVyMih7CisgICAgICAg IHsgIi9mcmFtZSIsIHsgZnJhbWVUZXh0IH0gfSwKKyAgICB9LCBUZXN0V2ViS2l0QVBJOjpIVFRQ U2VydmVyOjpQcm90b2NvbDo6SHR0cHMsIG51bGxwdHIsIG51bGxwdHIsIDkwOTEpOworCisgICAg YXV0byBwb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIGluaXRdKTsKKworICAg IFdLR2VvbG9jYXRpb25Qcm92aWRlclYxIHByb3ZpZGVyQ2FsbGJhY2s7CisgICAgbWVtc2V0KCZw cm92aWRlckNhbGxiYWNrLCAwLCBzaXplb2YoV0tHZW9sb2NhdGlvblByb3ZpZGVyVjEpKTsKKyAg ICBwcm92aWRlckNhbGxiYWNrLmJhc2UudmVyc2lvbiA9IDE7CisgICAgcHJvdmlkZXJDYWxsYmFj ay5zdGFydFVwZGF0aW5nID0gW10gKFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVmIG1hbmFnZXIsIGNv bnN0IHZvaWQqKSB7CisgICAgICAgIFdLR2VvbG9jYXRpb25NYW5hZ2VyUHJvdmlkZXJEaWRDaGFu Z2VQb3NpdGlvbihtYW5hZ2VyLCBhZG9wdFdLKFdLR2VvbG9jYXRpb25Qb3NpdGlvbkNyZWF0ZSgw LCA1MC42NDQzNTgsIDMuMzQ1NDUzLCAyLjUzKSkuZ2V0KCkpOworICAgIH07CisgICAgV0tHZW9s b2NhdGlvbk1hbmFnZXJTZXRQcm92aWRlcihXS0NvbnRleHRHZXRHZW9sb2NhdGlvbk1hbmFnZXIo KFdLQ29udGV4dFJlZilwb29sLmdldCgpKSwgJnByb3ZpZGVyQ2FsbGJhY2suYmFzZSk7CisKKyAg ICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wgPSBwb29s LmdldCgpOworCisgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMoW1tHZW9sb2NhdGlv blBlcm1pc3Npb25NZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAgIFtbY29uZmlndXJh dGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOm1lc3Nh Z2VIYW5kbGVyLmdldCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOworCisgICAgYXV0byB3ZWJWaWV3 ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFr ZSgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisK KyAgICBhdXRvIHBlcm1pc3Npb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tHZW9sb2NhdGlvbkRlbGVn YXRlTmV3IGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpwZXJtaXNz aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9w dE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOworICAgIFtuYXZpZ2F0aW9uRGVsZWdh dGUgc2V0RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl4oV0tXZWJWaWV3ICosIE5T VVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgdm9pZCAoXmNhbGxiYWNrKShO U1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24sIE5TVVJMQ3JlZGVudGlhbCAqKSkg eworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZS5hdXRo ZW50aWNhdGlvbk1ldGhvZCwgTlNVUkxBdXRoZW50aWNhdGlvbk1ldGhvZFNlcnZlclRydXN0KTsK KyAgICAgICAgY2FsbGJhY2soTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZVVzZUNyZWRlbnRpYWws IFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlhbEZvclRydXN0OmNoYWxsZW5nZS5wcm90ZWN0aW9u U3BhY2Uuc2VydmVyVHJ1c3RdKTsKKyAgICB9XTsKKyAgICB3ZWJWaWV3LmdldCgpLm5hdmlnYXRp b25EZWxlZ2F0ZSA9IG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKKworICAgIGRvbmUgPSBmYWxz ZTsKKyAgICBkaWRSZWNlaXZlTWVzc2FnZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnNlcnZlcjEucmVxdWVzdCgpXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRp ZFJlY2VpdmVNZXNzYWdlKTsKKyAgICBFWFBFQ1RfRkFMU0UoZG9uZSk7CiB9CiAKIEBpbnRlcmZh Y2UgSW5qZWN0ZWRCdW5kbGVOb2RlSGFuZGxlSXNTZWxlY3RFbGVtZW50RGVsZWdhdGUgOiBOU09i amVjdCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4K 423328 2021-03-16 07:45:16 -0700 2021-03-30 07:43:17 -0700 Patch bug-223248-20210316154513.patch text/plain 16358 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZiMmJhODZmYzViMDA3 NjQwZGQxMDg3NGYzZmYyMWM5YjllMDdmMi4uZDdkY2U2YTJiZjM1NjJkMWJlZTQyZDIwYjlkZTUy NjFlNjkzY2JhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAzLTE2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBcHBseSBwZXJtaXNzaW9u IHBvbGljeSB0byBnZW9sb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIzMjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgT25seSBhbGxvdyB0aGlyZC1wYXJ0eSBpZnJhbWVzIGlmIGFsbG93ZWQg YnkgcGVybWlzc2lvbiBwb2xpY3ksCisgICAgICAgIGZvbGxvd2luZyBodHRwczovL3czYy5naXRo dWIuaW8vZ2VvbG9jYXRpb24tYXBpLyNwZXJtaXNzaW9ucy1wb2xpY3kuCisgICAgICAgIENvdmVy ZWQgYnkgQVBJIHRlc3RzLgorCisgICAgICAgICogTW9kdWxlcy9nZW9sb2NhdGlvbi9HZW9sb2Nh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6c2hvdWxkQmxvY2tHZW9s b2NhdGlvblJlcXVlc3RzKToKKyAgICAgICAgKiBodG1sL0ZlYXR1cmVQb2xpY3kuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6cG9saWN5VHlwZU5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6RmVhdHVy ZVBvbGljeTo6cGFyc2UpOgorICAgICAgICAoV2ViQ29yZTo6RmVhdHVyZVBvbGljeTo6YWxsb3dz IGNvbnN0KToKKyAgICAgICAgKiBodG1sL0ZlYXR1cmVQb2xpY3kuaDoKKwogMjAyMS0wMy0xNiAg TGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbU09VUF0gRml4IFNP VVAzIGRlYnVnIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2dlb2xv Y2F0aW9uL0dlb2xvY2F0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRp b24vR2VvbG9jYXRpb24uY3BwCmluZGV4IDZkNWJlOWE1OTFhMjcyY2Q2N2Q2ZTlkMDk3YjMwNTA1 YmRmOGFlNWUuLjhkN2M3ZDNmN2QzYzQ4NTM0Y2E2NTBlZTk3YmEzMzQ3OTExZTM4ZjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb24uY3Bw CkBAIC0zMSw2ICszMSw3IEBACiAjaWYgRU5BQkxFKEdFT0xPQ0FUSU9OKQogCiAjaW5jbHVkZSAi RG9jdW1lbnQuaCIKKyNpbmNsdWRlICJGZWF0dXJlUG9saWN5LmgiCiAjaW5jbHVkZSAiRnJhbWUu aCIKICNpbmNsdWRlICJHZW9Ob3RpZmllci5oIgogI2luY2x1ZGUgIkdlb2xvY2F0aW9uQ29udHJv bGxlci5oIgpAQCAtMzUzLDYgKzM1NCw5IEBAIHN0YXRpYyBib29sIGlzUmVxdWVzdEZyb21JQm9v a3MoKQogICAgIAogYm9vbCBHZW9sb2NhdGlvbjo6c2hvdWxkQmxvY2tHZW9sb2NhdGlvblJlcXVl c3RzKCkKIHsKKyAgICBpZiAoIWlzRmVhdHVyZVBvbGljeUFsbG93ZWRCeURvY3VtZW50QW5kQWxs T3duZXJzKEZlYXR1cmVQb2xpY3k6OlR5cGU6Okdlb2xvY2F0aW9uLCAqZG9jdW1lbnQoKSwgTG9n RmVhdHVyZVBvbGljeUZhaWx1cmU6OlllcykpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAg Ym9vbCBpc1NlY3VyZSA9IFNlY3VyaXR5T3JpZ2luOjppc1NlY3VyZShkb2N1bWVudCgpLT51cmwo KSk7CiAgICAgYm9vbCBoYXNNaXhlZENvbnRlbnQgPSAhZG9jdW1lbnQoKS0+Zm91bmRNaXhlZENv bnRlbnQoKS5pc0VtcHR5KCk7CiAgICAgYm9vbCBpc0xvY2FsT3JpZ2luID0gc2VjdXJpdHlPcmln aW4oKS0+aXNMb2NhbCgpOwpAQCAtMzYwLDcgKzM2NCw3IEBAIGJvb2wgR2VvbG9jYXRpb246OnNo b3VsZEJsb2NrR2VvbG9jYXRpb25SZXF1ZXN0cygpCiAgICAgICAgIGlmIChpc0xvY2FsT3JpZ2lu IHx8IChpc1NlY3VyZSAmJiAhaGFzTWl4ZWRDb250ZW50KSB8fCBpc1JlcXVlc3RGcm9tSUJvb2tz KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIAorCiAgICAgbG9nRXJy b3Ioc2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKSwgaXNTZWN1cmUsIGhhc01peGVkQ29udGVu dCwgZG9jdW1lbnQoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0ZlYXR1cmVQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9GZWF0 dXJlUG9saWN5LmNwcAppbmRleCBlNTM5ZDZkNTJmZTM1NTM4M2EyNmM5NmI1YWNmNDQ5MTBlYjI1 NjgwLi44MzJhYmJhYTdmM2NkNzJkOWI4YTI4NmE4ZmU5MDc5MDNkNThkMjhkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZlYXR1cmVQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvRmVhdHVyZVBvbGljeS5jcHAKQEAgLTQ4LDYgKzQ4LDggQEAgc3RhdGljIGNvbnN0 IGNoYXIqIHBvbGljeVR5cGVOYW1lKEZlYXR1cmVQb2xpY3k6OlR5cGUgdHlwZSkKICAgICAgICAg cmV0dXJuICJTcGVha2VyU2VsZWN0aW9uIjsKICAgICBjYXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6 OkRpc3BsYXlDYXB0dXJlOgogICAgICAgICByZXR1cm4gIkRpc3BsYXlDYXB0dXJlIjsKKyAgICBj YXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6Okdlb2xvY2F0aW9uOgorICAgICAgICByZXR1cm4gIkdl b2xvY2F0aW9uIjsKICAgICBjYXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6OlN5bmNYSFI6CiAgICAg ICAgIHJldHVybiAiU3luY1hIUiI7CiAgICAgY2FzZSBGZWF0dXJlUG9saWN5OjpUeXBlOjpGdWxs c2NyZWVuOgpAQCAtMTY3LDYgKzE2OSw3IEBAIEZlYXR1cmVQb2xpY3kgRmVhdHVyZVBvbGljeTo6 cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBIVE1MSUZyYW1lRWxlbWVudCYKICAgICBi b29sIGlzTWljcm9waG9uZUluaXRpYWxpemVkID0gZmFsc2U7CiAgICAgYm9vbCBpc1NwZWFrZXJT ZWxlY3Rpb25Jbml0aWFsaXplZCA9IGZhbHNlOwogICAgIGJvb2wgaXNEaXNwbGF5Q2FwdHVyZUlu aXRpYWxpemVkID0gZmFsc2U7CisgICAgYm9vbCBpc0dlb2xvY2F0aW9uSW5pdGlhbGl6ZWQgPSBm YWxzZTsKICAgICBib29sIGlzU3luY1hIUkluaXRpYWxpemVkID0gZmFsc2U7CiAgICAgYm9vbCBp c0Z1bGxzY3JlZW5Jbml0aWFsaXplZCA9IGZhbHNlOwogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5U QVRJT04pCkBAIC0xOTksNiArMjAyLDExIEBAIEZlYXR1cmVQb2xpY3kgRmVhdHVyZVBvbGljeTo6 cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBIVE1MSUZyYW1lRWxlbWVudCYKICAgICAg ICAgICAgIHVwZGF0ZUxpc3QoZG9jdW1lbnQsIHBvbGljeS5tX2Rpc3BsYXlDYXB0dXJlUnVsZSwg aXRlbS5zdWJzdHJpbmcoMTYpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Cisg ICAgICAgIGlmIChpdGVtLnN0YXJ0c1dpdGgoImdlb2xvY2F0aW9uIikpIHsKKyAgICAgICAgICAg IGlzR2VvbG9jYXRpb25Jbml0aWFsaXplZCA9IHRydWU7CisgICAgICAgICAgICB1cGRhdGVMaXN0 KGRvY3VtZW50LCBwb2xpY3kubV9nZW9sb2NhdGlvblJ1bGUsIGl0ZW0uc3Vic3RyaW5nKDEyKSk7 CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAoaXRlbS5zdGFy dHNXaXRoKCJzeW5jLXhociIpKSB7CiAgICAgICAgICAgICBpc1N5bmNYSFJJbml0aWFsaXplZCA9 IHRydWU7CiAgICAgICAgICAgICB1cGRhdGVMaXN0KGRvY3VtZW50LCBwb2xpY3kubV9zeW5jWEhS UnVsZSwgaXRlbS5zdWJzdHJpbmcoOSkpOwpAQCAtMjQ0LDYgKzI1Miw4IEBAIEZlYXR1cmVQb2xp Y3kgRmVhdHVyZVBvbGljeTo6cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBIVE1MSUZy YW1lRWxlbWVudCYKICAgICAgICAgcG9saWN5Lm1fc3BlYWtlclNlbGVjdGlvblJ1bGUuYWxsb3dl ZExpc3QuYWRkKGRvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkuZGF0YSgpKTsKICAgICBpZiAoIWlz RGlzcGxheUNhcHR1cmVJbml0aWFsaXplZCkKICAgICAgICAgcG9saWN5Lm1fZGlzcGxheUNhcHR1 cmVSdWxlLmFsbG93ZWRMaXN0LmFkZChkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSk7 CisgICAgaWYgKCFpc0dlb2xvY2F0aW9uSW5pdGlhbGl6ZWQpCisgICAgICAgIHBvbGljeS5tX2dl b2xvY2F0aW9uUnVsZS5hbGxvd2VkTGlzdC5hZGQoZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKS5k YXRhKCkpOwogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCiAgICAgaWYgKCFpc0d5cm9z Y29wZUluaXRpYWxpemVkKQogICAgICAgICBwb2xpY3kubV9neXJvc2NvcGVSdWxlLmFsbG93ZWRM aXN0LmFkZChkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSk7CkBAIC0yODksNiArMjk5 LDggQEAgYm9vbCBGZWF0dXJlUG9saWN5OjphbGxvd3MoVHlwZSB0eXBlLCBjb25zdCBTZWN1cml0 eU9yaWdpbkRhdGEmIG9yaWdpbikgY29uc3QKICAgICAgICAgcmV0dXJuIGlzQWxsb3dlZEJ5RmVh dHVyZVBvbGljeShtX3NwZWFrZXJTZWxlY3Rpb25SdWxlLCBvcmlnaW4pOwogICAgIGNhc2UgVHlw ZTo6RGlzcGxheUNhcHR1cmU6CiAgICAgICAgIHJldHVybiBpc0FsbG93ZWRCeUZlYXR1cmVQb2xp Y3kobV9kaXNwbGF5Q2FwdHVyZVJ1bGUsIG9yaWdpbik7CisgICAgY2FzZSBUeXBlOjpHZW9sb2Nh dGlvbjoKKyAgICAgICAgcmV0dXJuIGlzQWxsb3dlZEJ5RmVhdHVyZVBvbGljeShtX2dlb2xvY2F0 aW9uUnVsZSwgb3JpZ2luKTsKICAgICBjYXNlIFR5cGU6OlN5bmNYSFI6CiAgICAgICAgIHJldHVy biBpc0FsbG93ZWRCeUZlYXR1cmVQb2xpY3kobV9zeW5jWEhSUnVsZSwgb3JpZ2luKTsKICAgICBj YXNlIFR5cGU6OkZ1bGxzY3JlZW46CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zl YXR1cmVQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGljeS5oCmluZGV4 IGVlZGU4ZjE5NzcyMDMxZTEwYjljNGQyOTM4NGIzZDUwYThjN2E5YWMuLjdiNjQ1NjE3MTY1ZjQw MWNlM2JiODAxZDMyMDIwOTU4NzUyMWI2ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvRmVhdHVyZVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGlj eS5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAgICAgICAgTWljcm9waG9uZSwKICAgICAg ICAgU3BlYWtlclNlbGVjdGlvbiwKICAgICAgICAgRGlzcGxheUNhcHR1cmUsCisgICAgICAgIEdl b2xvY2F0aW9uLAogICAgICAgICBTeW5jWEhSLAogICAgICAgICBGdWxsc2NyZWVuLAogI2lmIEVO QUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCkBAIC02Nyw2ICs2OCw3IEBAIHByaXZhdGU6CiAgICAg QWxsb3dSdWxlIG1fbWljcm9waG9uZVJ1bGU7CiAgICAgQWxsb3dSdWxlIG1fc3BlYWtlclNlbGVj dGlvblJ1bGU7CiAgICAgQWxsb3dSdWxlIG1fZGlzcGxheUNhcHR1cmVSdWxlOworICAgIEFsbG93 UnVsZSBtX2dlb2xvY2F0aW9uUnVsZTsKICAgICBBbGxvd1J1bGUgbV9zeW5jWEhSUnVsZTsKICAg ICBBbGxvd1J1bGUgbV9mdWxsc2NyZWVuUnVsZTsKICNpZiBFTkFCTEUoREVWSUNFX09SSUVOVEFU SU9OKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDU2MjQzN2U2N2M5YmFmZDBkNjA2N2Q3NTZiYmEyZDFlOTFkYjA2YjMuLjI2MzU5MzM1YmU3YWQ5 OGQ5NDM2ZjU2MTY5OGU3YThjMzI5ZGMwMjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wMy0xNiAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgQXBwbHkgcGVybWlzc2lvbiBw b2xpY3kgdG8gZ2VvbG9jYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMzI0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRl Lm1tOgorICAgICAgICAoLVtHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IHNldFZhbGlkYXRpb25IYW5k bGVyOl0pOgorICAgICAgICAoLVtHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IF93ZWJWaWV3OnJlcXVl c3RHZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JPcmlnaW46aW5pdGlhdGVkQnlGcmFtZTpkZWNpc2lv bkhhbmRsZXI6XSk6CisgICAgICAgICgtW0dlb2xvY2F0aW9uUGVybWlzc2lvbk1lc3NhZ2VIYW5k bGVyIHVzZXJDb250ZW50Q29udHJvbGxlcjpkaWRSZWNlaXZlU2NyaXB0TWVzc2FnZTpdKToKKwog MjAyMS0wMy0xNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAg QWxpZ24gZGV2aWNlIG9yaWVudGF0aW9uIGRlbGVnYXRlIHRvIGdldFVzZXJNZWRpYS9nZW9sb2Nh dGlvbiBkZWxlZ2F0ZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvVUlEZWxlZ2F0ZS5tbQppbmRleCAxN2M1MmY0OTgxMjU2Nzg2MWYwOTFmMDQ3NzU1MzU2 MDFjMjQwZTkwLi5iNjg0M2NjNDk0NGRkODljMGViNDdkNjU0ZjBiMDEzZTRiMGU4NDVlIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVsZWdhdGUu bW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRl Lm1tCkBAIC00OCw2ICs0OCw3IEBACiAjZW5kaWYKIAogc3RhdGljIGJvb2wgZG9uZTsKK3N0YXRp YyBib29sIGRpZFJlY2VpdmVNZXNzYWdlOwogCiBAaW50ZXJmYWNlIEF1ZGlvT2JzZXJ2ZXIgOiBO U09iamVjdAogQGVuZApAQCAtMTczLDMzICsxNzQsNDMgQEAgVEVTVChXZWJLaXQsIEdlb2xvY2F0 aW9uUGVybWlzc2lvbikKIH0KIAogQGludGVyZmFjZSBHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IDog TlNPYmplY3QgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+CistICh2b2lkKXNldFZhbGlkYXRpb25IYW5k bGVyOihGdW5jdGlvbjx2b2lkKFdLU2VjdXJpdHlPcmlnaW4qLCBXS0ZyYW1lSW5mbyopPiYmKXZh bGlkYXRpb25IYW5kbGVyOwogQGVuZAogCi1AaW1wbGVtZW50YXRpb24gR2VvbG9jYXRpb25EZWxl Z2F0ZU5ldwotLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyByZXF1ZXN0R2Vv bG9jYXRpb25QZXJtaXNzaW9uRm9yT3JpZ2luOihXS1NlY3VyaXR5T3JpZ2luKilvcmlnaW4gaW5p dGlhdGVkQnlGcmFtZTooV0tGcmFtZUluZm8gKilmcmFtZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQg KF4pKF9XS1Blcm1pc3Npb25EZWNpc2lvbiBkZWNpc2lvbikpZGVjaXNpb25IYW5kbGVyIHsKLSAg ICBFWFBFQ1RfV0tfU1RSRVEob3JpZ2luLnByb3RvY29sLCBAImh0dHBzIik7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKG9yaWdpbi5ob3N0LCBAIjEyNy4wLjAuMSIpOwotICAgIEVYUEVDVF9FUShvcmln aW4ucG9ydCwgOTA5MCk7CitAaW1wbGVtZW50YXRpb24gR2VvbG9jYXRpb25EZWxlZ2F0ZU5ldyB7 CisgICAgRnVuY3Rpb248dm9pZChXS1NlY3VyaXR5T3JpZ2luKiwgV0tGcmFtZUluZm8qKT4gX3Zh bGlkYXRpb25IYW5kbGVyOworfQorLSAodm9pZClzZXRWYWxpZGF0aW9uSGFuZGxlcjooRnVuY3Rp b248dm9pZChXS1NlY3VyaXR5T3JpZ2luKiwgV0tGcmFtZUluZm8qKT4mJil2YWxpZGF0aW9uSGFu ZGxlciB7CisgICAgX3ZhbGlkYXRpb25IYW5kbGVyID0gV1RGTW92ZSh2YWxpZGF0aW9uSGFuZGxl cik7Cit9CiAKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4ucHJvdG9j b2wsIEAiaHR0cHMiKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4u aG9zdCwgQCIxMjcuMC4wLjEiKTsKLSAgICBFWFBFQ1RfRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4u cG9ydCwgOTA5MSk7Ci0gICAgRVhQRUNUX0ZBTFNFKGZyYW1lLmlzTWFpbkZyYW1lKTsKLSAgICBF WFBFQ1RfVFJVRShmcmFtZS53ZWJWaWV3ID09IHdlYlZpZXcpOworLSAodm9pZClfd2ViVmlldzoo V0tXZWJWaWV3ICopd2ViVmlldyByZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNzaW9uRm9yT3JpZ2lu OihXS1NlY3VyaXR5T3JpZ2luKilvcmlnaW4gaW5pdGlhdGVkQnlGcmFtZTooV0tGcmFtZUluZm8g KilmcmFtZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS1Blcm1pc3Npb25EZWNpc2lvbiBk ZWNpc2lvbikpZGVjaXNpb25IYW5kbGVyIHsKKyAgICBpZiAoX3ZhbGlkYXRpb25IYW5kbGVyKQor ICAgICAgICBfdmFsaWRhdGlvbkhhbmRsZXIob3JpZ2luLCBmcmFtZSk7CiAKICAgICBkb25lICA9 IHRydWU7CiAgICAgZGVjaXNpb25IYW5kbGVyKF9XS1Blcm1pc3Npb25EZWNpc2lvbkdyYW50KTsK IH0KIEBlbmQKIAorQGludGVyZmFjZSBHZW9sb2NhdGlvblBlcm1pc3Npb25NZXNzYWdlSGFuZGxl ciA6IE5TT2JqZWN0IDxXS1NjcmlwdE1lc3NhZ2VIYW5kbGVyPgorQGVuZAorCitAaW1wbGVtZW50 YXRpb24gR2VvbG9jYXRpb25QZXJtaXNzaW9uTWVzc2FnZUhhbmRsZXIKKy0gKHZvaWQpdXNlckNv bnRlbnRDb250cm9sbGVyOihXS1VzZXJDb250ZW50Q29udHJvbGxlciAqKXVzZXJDb250ZW50Q29u dHJvbGxlciBkaWRSZWNlaXZlU2NyaXB0TWVzc2FnZTooV0tTY3JpcHRNZXNzYWdlICopbWVzc2Fn ZQoreworICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gdHJ1ZTsKK30KK0BlbmQKKwogc3RhdGljIGNv bnN0IGNoYXIqIG1haW5GcmFtZVRleHQgPSBSIkRPQ0RPQ0RPQygKIDxodG1sPjxib2R5PgotPGlm cmFtZSBzcmM9J2h0dHBzOi8vMTI3LjAuMC4xOjkwOTEvZnJhbWUnIGFsbG93PSdjYW1lcmE6aHR0 cHM6Ly8xMjcuMC4wLjE6OTA5MSc+PC9pZnJhbWU+Cis8aWZyYW1lIHNyYz0naHR0cHM6Ly8xMjcu MC4wLjE6OTA5MS9mcmFtZScgYWxsb3c9J2dlb2xvY2F0aW9uOmh0dHBzOi8vMTI3LjAuMC4xOjkw OTEnPjwvaWZyYW1lPgogPC9ib2R5PjwvaHRtbD4KIClET0NET0NET0MiOwogc3RhdGljIGNvbnN0 IGNoYXIqIGZyYW1lVGV4dCA9IFIiRE9DRE9DRE9DKAogPGh0bWw+PGJvZHk+PHNjcmlwdD4KLW5h dmlnYXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oKCkgPT4geyB9KTsKK25hdmln YXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oKCkgPT4geyB3ZWJraXQubWVzc2Fn ZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCJvayIpIH0sICgpID0+IHsgd2Via2l0 Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgia28iKSB9KTsKIDwvc2Ny aXB0PjwvYm9keT48L2h0bWw+CiApRE9DRE9DRE9DIjsKIApAQCAtMjI1LDEwICsyMzYsMTQgQEAg VEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lvbkluSUZyYW1lKQogCiAgICAgYXV0byBj b25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGlu aXRdKTsKICAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29sID0gcG9vbC5nZXQoKTsK KworICAgIGF1dG8gbWVzc2FnZUhhbmRsZXIgPSBhZG9wdE5TKFtbR2VvbG9jYXRpb25QZXJtaXNz aW9uTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gdXNl ckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxl ci5nZXQoKSBuYW1lOkAidGVzdEhhbmRsZXIiXTsKKwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0 TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwg ODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogCi0gICAgYXV0 byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tHZW9sb2NhdGlvbkRlbGVnYXRlTmV3IGFsbG9jXSBpbml0 XSk7Ci0gICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisgICAgYXV0 byBwZXJtaXNzaW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbR2VvbG9jYXRpb25EZWxlZ2F0ZU5ldyBh bGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6cGVybWlzc2lvbkRlbGVn YXRlLmdldCgpXTsKIAogICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbVGVz dE5hdmlnYXRpb25EZWxlZ2F0ZSBuZXddKTsKICAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHNldERp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpeKFdLV2ViVmlldyAqLCBOU1VSTEF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlICpjaGFsbGVuZ2UsIHZvaWQgKF5jYWxsYmFjaykoTlNVUkxTZXNz aW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uLCBOU1VSTENyZWRlbnRpYWwgKikpIHsKQEAgLTIz Nyw4ICsyNTIsNzQgQEAgVEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lvbkluSUZyYW1l KQogICAgIH1dOwogICAgIHdlYlZpZXcuZ2V0KCkubmF2aWdhdGlvbkRlbGVnYXRlID0gbmF2aWdh dGlvbkRlbGVnYXRlLmdldCgpOwogCisgICAgW3Blcm1pc3Npb25EZWxlZ2F0ZSBzZXRWYWxpZGF0 aW9uSGFuZGxlcjpbJndlYlZpZXddKFdLU2VjdXJpdHlPcmlnaW4gKm9yaWdpbiwgV0tGcmFtZUlu Zm8gKmZyYW1lKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShvcmlnaW4ucHJvdG9jb2wsIEAi aHR0cHMiKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKG9yaWdpbi5ob3N0LCBAIjEyNy4wLjAu MSIpOworICAgICAgICBFWFBFQ1RfRVEob3JpZ2luLnBvcnQsIDkwOTApOworCisgICAgICAgIEVY UEVDVF9XS19TVFJFUShmcmFtZS5zZWN1cml0eU9yaWdpbi5wcm90b2NvbCwgQCJodHRwcyIpOwor ICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4uaG9zdCwgQCIxMjcu MC4wLjEiKTsKKyAgICAgICAgRVhQRUNUX0VRKGZyYW1lLnNlY3VyaXR5T3JpZ2luLnBvcnQsIDkw OTEpOworICAgICAgICBFWFBFQ1RfRkFMU0UoZnJhbWUuaXNNYWluRnJhbWUpOworICAgICAgICBF WFBFQ1RfVFJVRShmcmFtZS53ZWJWaWV3ID09IHdlYlZpZXcpOworICAgIH1dOworCisgICAgZG9u ZSA9IGZhbHNlOworICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gZmFsc2U7CiAgICAgW3dlYlZpZXcg bG9hZFJlcXVlc3Q6c2VydmVyMS5yZXF1ZXN0KCldOwotICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6 OnJ1bigmZG9uZSk7CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRSZWNlaXZlTWVz c2FnZSk7CisgICAgRVhQRUNUX1RSVUUoZG9uZSk7Cit9CisKK3N0YXRpYyBjb25zdCBjaGFyKiBu b3RBbGxvd2luZ01haW5GcmFtZVRleHQgPSBSIkRPQ0RPQ0RPQygKKzxodG1sPjxib2R5PgorPGlm cmFtZSBzcmM9J2h0dHBzOi8vMTI3LjAuMC4xOjkwOTEvZnJhbWUnIGFsbG93PSdnZW9sb2NhdGlv bjpodHRwczovLzEyNy4wLjAuMTo5MDkyJz48L2lmcmFtZT4KKzwvYm9keT48L2h0bWw+CispRE9D RE9DRE9DIjsKKworVEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lvbkluRGlzYWxsb3dl ZElGcmFtZSkKK3sKKyAgICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNlcnZlcjEoeworICAg ICAgICB7ICIvIiwgeyBub3RBbGxvd2luZ01haW5GcmFtZVRleHQgfSB9CisgICAgfSwgVGVzdFdl YktpdEFQSTo6SFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzLCBudWxscHRyLCBudWxscHRyLCA5 MDkwKTsKKworICAgIFRlc3RXZWJLaXRBUEk6OkhUVFBTZXJ2ZXIgc2VydmVyMih7CisgICAgICAg IHsgIi9mcmFtZSIsIHsgZnJhbWVUZXh0IH0gfSwKKyAgICB9LCBUZXN0V2ViS2l0QVBJOjpIVFRQ U2VydmVyOjpQcm90b2NvbDo6SHR0cHMsIG51bGxwdHIsIG51bGxwdHIsIDkwOTEpOworCisgICAg YXV0byBwb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIGluaXRdKTsKKworICAg IFdLR2VvbG9jYXRpb25Qcm92aWRlclYxIHByb3ZpZGVyQ2FsbGJhY2s7CisgICAgbWVtc2V0KCZw cm92aWRlckNhbGxiYWNrLCAwLCBzaXplb2YoV0tHZW9sb2NhdGlvblByb3ZpZGVyVjEpKTsKKyAg ICBwcm92aWRlckNhbGxiYWNrLmJhc2UudmVyc2lvbiA9IDE7CisgICAgcHJvdmlkZXJDYWxsYmFj ay5zdGFydFVwZGF0aW5nID0gW10gKFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVmIG1hbmFnZXIsIGNv bnN0IHZvaWQqKSB7CisgICAgICAgIFdLR2VvbG9jYXRpb25NYW5hZ2VyUHJvdmlkZXJEaWRDaGFu Z2VQb3NpdGlvbihtYW5hZ2VyLCBhZG9wdFdLKFdLR2VvbG9jYXRpb25Qb3NpdGlvbkNyZWF0ZSgw LCA1MC42NDQzNTgsIDMuMzQ1NDUzLCAyLjUzKSkuZ2V0KCkpOworICAgIH07CisgICAgV0tHZW9s b2NhdGlvbk1hbmFnZXJTZXRQcm92aWRlcihXS0NvbnRleHRHZXRHZW9sb2NhdGlvbk1hbmFnZXIo KFdLQ29udGV4dFJlZilwb29sLmdldCgpKSwgJnByb3ZpZGVyQ2FsbGJhY2suYmFzZSk7CisKKyAg ICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wgPSBwb29s LmdldCgpOworCisgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMoW1tHZW9sb2NhdGlv blBlcm1pc3Npb25NZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAgIFtbY29uZmlndXJh dGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOm1lc3Nh Z2VIYW5kbGVyLmdldCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOworCisgICAgYXV0byB3ZWJWaWV3 ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFr ZSgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisK KyAgICBhdXRvIHBlcm1pc3Npb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tHZW9sb2NhdGlvbkRlbGVn YXRlTmV3IGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpwZXJtaXNz aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9w dE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOworICAgIFtuYXZpZ2F0aW9uRGVsZWdh dGUgc2V0RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl4oV0tXZWJWaWV3ICosIE5T VVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgdm9pZCAoXmNhbGxiYWNrKShO U1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24sIE5TVVJMQ3JlZGVudGlhbCAqKSkg eworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZS5hdXRo ZW50aWNhdGlvbk1ldGhvZCwgTlNVUkxBdXRoZW50aWNhdGlvbk1ldGhvZFNlcnZlclRydXN0KTsK KyAgICAgICAgY2FsbGJhY2soTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZVVzZUNyZWRlbnRpYWws IFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlhbEZvclRydXN0OmNoYWxsZW5nZS5wcm90ZWN0aW9u U3BhY2Uuc2VydmVyVHJ1c3RdKTsKKyAgICB9XTsKKyAgICB3ZWJWaWV3LmdldCgpLm5hdmlnYXRp b25EZWxlZ2F0ZSA9IG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKKworICAgIGRvbmUgPSBmYWxz ZTsKKyAgICBkaWRSZWNlaXZlTWVzc2FnZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnNlcnZlcjEucmVxdWVzdCgpXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRp ZFJlY2VpdmVNZXNzYWdlKTsKKyAgICBFWFBFQ1RfRkFMU0UoZG9uZSk7CiB9CiAKIEBpbnRlcmZh Y2UgSW5qZWN0ZWRCdW5kbGVOb2RlSGFuZGxlSXNTZWxlY3RFbGVtZW50RGVsZWdhdGUgOiBOU09i amVjdCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyODI1OTIyMzA2YjMxZDY1ZDdjYTk2 Y2RiMTA1ZWVlY2RjZjhiZWI1Li44NDA0NTczYjg1MzIzOWVmODAzZWEwNTY3ZDE0MDE2OTFiZDZi NmE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDMtMTYgIFlvdWVubiBGYWJsZXQgIDx5 b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFwcGx5IHBlcm1pc3Npb24gcG9saWN5IHRvIGdl b2xvY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjMyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvc2FuZGJveGVkLWlmcmFtZS1nZW9sb2NhdGlvbi1nZXRD dXJyZW50UG9zaXRpb24tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJp dHkvc2FuZGJveGVkLWlmcmFtZS1nZW9sb2NhdGlvbi13YXRjaFBvc2l0aW9uLWV4cGVjdGVkLnR4 dDoKKwogMjAyMS0wMy0xNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAg ICAgICAgWyBtYWNPcyBXazEgXSBodHRwL3dwdC9maWxlcmVhZGVyL2ZpbGVyZWFkZXItc3RvcC5o dG1sIGlzIGEgZmxha2V5IHRleHQgZmFpbHVyZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9zYW5kYm94ZWQtaWZyYW1lLWdlb2xvY2F0aW9uLWdldEN1cnJlbnRQ b3NpdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3Nh bmRib3hlZC1pZnJhbWUtZ2VvbG9jYXRpb24tZ2V0Q3VycmVudFBvc2l0aW9uLWV4cGVjdGVkLnR4 dAppbmRleCA5ZDY3NWI0MzRiZDhjNWU1NDIzZmI5NjQ3ZTkzMGY4MWJjMzM1ZDBkLi5jNDRlMDk4 YjZlMzg3M2NmOWYzYTliODk5OGE2YjJmNTBjMjFiZGFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3NhbmRib3hlZC1pZnJhbWUtZ2VvbG9jYXRpb24tZ2V0Q3Vy cmVudFBvc2l0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Nl Y3VyaXR5L3NhbmRib3hlZC1pZnJhbWUtZ2VvbG9jYXRpb24tZ2V0Q3VycmVudFBvc2l0aW9uLWV4 cGVjdGVkLnR4dApAQCAtMSwzICsxLDQgQEAKK0NPTlNPTEUgTUVTU0FHRTogRmVhdHVyZSBwb2xp Y3kgJ0dlb2xvY2F0aW9uJyBjaGVjayBmYWlsZWQgZm9yIGlmcmFtZSB3aXRoIG9yaWdpbiAnbnVs bCcgYW5kIGFsbG93IGF0dHJpYnV0ZSAnJy4KIFRlc3RzIHRoYXQgbmF2aWdhdG9yLmdlb2xvY2F0 aW9uLmdldEN1cnJlbnRQb3NpdGlvbigpIHJldHVybnMgZXJyb3IgUEVSTUlTU0lPTl9ERU5JRUQg d2hlbiBjYWxsZWQgZnJvbSBhIGRvY3VtZW50IGluIGEgc2FuZGJveGVkIGlmcmFtZS4KIAogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3NhbmRib3hlZC1pZnJh bWUtZ2VvbG9jYXRpb24td2F0Y2hQb3NpdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3NlY3VyaXR5L3NhbmRib3hlZC1pZnJhbWUtZ2VvbG9jYXRpb24td2F0Y2hQb3Np dGlvbi1leHBlY3RlZC50eHQKaW5kZXggZjBmMTU3MWRlYTZjNzM5ZDFiOGM1Mjg2NzQ0NmI0ZjNm ZGU2NDg0OC4uNTk4M2Q2ZDVlODJkMDVhODk4NWU3ZDRjYWNjNWUxNjk5NWU1YjY2YiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9zYW5kYm94ZWQtaWZyYW1lLWdl b2xvY2F0aW9uLXdhdGNoUG9zaXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvc2VjdXJpdHkvc2FuZGJveGVkLWlmcmFtZS1nZW9sb2NhdGlvbi13YXRjaFBvc2l0 aW9uLWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDQgQEAKK0NPTlNPTEUgTUVTU0FHRTogRmVhdHVy ZSBwb2xpY3kgJ0dlb2xvY2F0aW9uJyBjaGVjayBmYWlsZWQgZm9yIGlmcmFtZSB3aXRoIG9yaWdp biAnbnVsbCcgYW5kIGFsbG93IGF0dHJpYnV0ZSAnJy4KIFRlc3RzIHRoYXQgbmF2aWdhdG9yLmdl b2xvY2F0aW9uLndhdGNoUG9zaXRpb24oKSByZXR1cm5zIGVycm9yIFBFUk1JU1NJT05fREVOSUVE IHdoZW4gY2FsbGVkIGZyb20gYSBkb2N1bWVudCBpbiBhIHNhbmRib3hlZCBpZnJhbWUuCiAKIAo= 424637 2021-03-30 07:43:22 -0700 2021-03-31 04:16:19 -0700 Patch for landing bug-223248-20210330164320.patch text/plain 16456 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDFlY2M3YTA3YjdjZTE5 OWY1MzNjZWJmZDBiODQ5M2FlNmIxYzkwZS4uNjRmZGM4MWE4MzhlZmU0ZGFlMmU4MjZjZDZlN2Zi MTU0N2E4YWMwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAzLTMwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBcHBseSBwZXJtaXNzaW9u IHBvbGljeSB0byBnZW9sb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIzMjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29u LgorCisgICAgICAgIE9ubHkgYWxsb3cgdGhpcmQtcGFydHkgaWZyYW1lcyBpZiBhbGxvd2VkIGJ5 IHBlcm1pc3Npb24gcG9saWN5LAorICAgICAgICBmb2xsb3dpbmcgaHR0cHM6Ly93M2MuZ2l0aHVi LmlvL2dlb2xvY2F0aW9uLWFwaS8jcGVybWlzc2lvbnMtcG9saWN5LgorICAgICAgICBDb3ZlcmVk IGJ5IEFQSSB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnNob3VsZEJsb2NrR2VvbG9j YXRpb25SZXF1ZXN0cyk6CisgICAgICAgICogaHRtbC9GZWF0dXJlUG9saWN5LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnBvbGljeVR5cGVOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkZlYXR1cmVQ b2xpY3k6OnBhcnNlKToKKyAgICAgICAgKFdlYkNvcmU6OkZlYXR1cmVQb2xpY3k6OmFsbG93cyBj b25zdCk6CisgICAgICAgICogaHRtbC9GZWF0dXJlUG9saWN5Lmg6CisKIDIwMjEtMDMtMjkgIERh dmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2Vk IHN0cnVjdCBXZWJDb3JlOjpBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyOjpBbHRlcm5hdGl2ZVRl eHRJbmZvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2dlb2xvY2F0aW9uL0dl b2xvY2F0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9j YXRpb24uY3BwCmluZGV4IDA3YzU0YjExYzcxMzZlYzYwNDZhNmYyNDdjZjJmNmQxYWFmNDZiOTIu LjY4YmRjNDU4ZGVmM2YyNmUxNjFhOGUzOTk0NzNhYTI5Nzg3M2NlZWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb24uY3BwCkBAIC0zMSw2 ICszMSw3IEBACiAjaWYgRU5BQkxFKEdFT0xPQ0FUSU9OKQogCiAjaW5jbHVkZSAiRG9jdW1lbnQu aCIKKyNpbmNsdWRlICJGZWF0dXJlUG9saWN5LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNs dWRlICJHZW9Ob3RpZmllci5oIgogI2luY2x1ZGUgIkdlb2xvY2F0aW9uQ29udHJvbGxlci5oIgpA QCAtMzUxLDYgKzM1Miw5IEBAIHN0YXRpYyBib29sIGlzUmVxdWVzdEZyb21JQm9va3MoKQogICAg IAogYm9vbCBHZW9sb2NhdGlvbjo6c2hvdWxkQmxvY2tHZW9sb2NhdGlvblJlcXVlc3RzKCkKIHsK KyAgICBpZiAoIWlzRmVhdHVyZVBvbGljeUFsbG93ZWRCeURvY3VtZW50QW5kQWxsT3duZXJzKEZl YXR1cmVQb2xpY3k6OlR5cGU6Okdlb2xvY2F0aW9uLCAqZG9jdW1lbnQoKSwgTG9nRmVhdHVyZVBv bGljeUZhaWx1cmU6OlllcykpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgYm9vbCBpc1Nl Y3VyZSA9IFNlY3VyaXR5T3JpZ2luOjppc1NlY3VyZShkb2N1bWVudCgpLT51cmwoKSkgfHwgZG9j dW1lbnQoKS0+aXNTZWN1cmVDb250ZXh0KCk7CiAgICAgYm9vbCBoYXNNaXhlZENvbnRlbnQgPSAh ZG9jdW1lbnQoKS0+Zm91bmRNaXhlZENvbnRlbnQoKS5pc0VtcHR5KCk7CiAgICAgYm9vbCBpc0xv Y2FsT3JpZ2luID0gc2VjdXJpdHlPcmlnaW4oKS0+aXNMb2NhbCgpOwpAQCAtMzU4LDcgKzM2Miw3 IEBAIGJvb2wgR2VvbG9jYXRpb246OnNob3VsZEJsb2NrR2VvbG9jYXRpb25SZXF1ZXN0cygpCiAg ICAgICAgIGlmIChpc0xvY2FsT3JpZ2luIHx8IChpc1NlY3VyZSAmJiAhaGFzTWl4ZWRDb250ZW50 KSB8fCBpc1JlcXVlc3RGcm9tSUJvb2tzKCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQotICAgIAorCiAgICAgbG9nRXJyb3Ioc2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKSwg aXNTZWN1cmUsIGhhc01peGVkQ29udGVudCwgZG9jdW1lbnQoKSk7CiAgICAgcmV0dXJuIHRydWU7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZlYXR1cmVQb2xpY3kuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9GZWF0dXJlUG9saWN5LmNwcAppbmRleCBlNTM5ZDZkNTJmZTM1 NTM4M2EyNmM5NmI1YWNmNDQ5MTBlYjI1NjgwLi44MzJhYmJhYTdmM2NkNzJkOWI4YTI4NmE4ZmU5 MDc5MDNkNThkMjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZlYXR1cmVQb2xp Y3kuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGljeS5jcHAKQEAgLTQ4 LDYgKzQ4LDggQEAgc3RhdGljIGNvbnN0IGNoYXIqIHBvbGljeVR5cGVOYW1lKEZlYXR1cmVQb2xp Y3k6OlR5cGUgdHlwZSkKICAgICAgICAgcmV0dXJuICJTcGVha2VyU2VsZWN0aW9uIjsKICAgICBj YXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6OkRpc3BsYXlDYXB0dXJlOgogICAgICAgICByZXR1cm4g IkRpc3BsYXlDYXB0dXJlIjsKKyAgICBjYXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6Okdlb2xvY2F0 aW9uOgorICAgICAgICByZXR1cm4gIkdlb2xvY2F0aW9uIjsKICAgICBjYXNlIEZlYXR1cmVQb2xp Y3k6OlR5cGU6OlN5bmNYSFI6CiAgICAgICAgIHJldHVybiAiU3luY1hIUiI7CiAgICAgY2FzZSBG ZWF0dXJlUG9saWN5OjpUeXBlOjpGdWxsc2NyZWVuOgpAQCAtMTY3LDYgKzE2OSw3IEBAIEZlYXR1 cmVQb2xpY3kgRmVhdHVyZVBvbGljeTo6cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBI VE1MSUZyYW1lRWxlbWVudCYKICAgICBib29sIGlzTWljcm9waG9uZUluaXRpYWxpemVkID0gZmFs c2U7CiAgICAgYm9vbCBpc1NwZWFrZXJTZWxlY3Rpb25Jbml0aWFsaXplZCA9IGZhbHNlOwogICAg IGJvb2wgaXNEaXNwbGF5Q2FwdHVyZUluaXRpYWxpemVkID0gZmFsc2U7CisgICAgYm9vbCBpc0dl b2xvY2F0aW9uSW5pdGlhbGl6ZWQgPSBmYWxzZTsKICAgICBib29sIGlzU3luY1hIUkluaXRpYWxp emVkID0gZmFsc2U7CiAgICAgYm9vbCBpc0Z1bGxzY3JlZW5Jbml0aWFsaXplZCA9IGZhbHNlOwog I2lmIEVOQUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCkBAIC0xOTksNiArMjAyLDExIEBAIEZlYXR1 cmVQb2xpY3kgRmVhdHVyZVBvbGljeTo6cGFyc2UoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBI VE1MSUZyYW1lRWxlbWVudCYKICAgICAgICAgICAgIHVwZGF0ZUxpc3QoZG9jdW1lbnQsIHBvbGlj eS5tX2Rpc3BsYXlDYXB0dXJlUnVsZSwgaXRlbS5zdWJzdHJpbmcoMTYpKTsKICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICB9CisgICAgICAgIGlmIChpdGVtLnN0YXJ0c1dpdGgoImdlb2xv Y2F0aW9uIikpIHsKKyAgICAgICAgICAgIGlzR2VvbG9jYXRpb25Jbml0aWFsaXplZCA9IHRydWU7 CisgICAgICAgICAgICB1cGRhdGVMaXN0KGRvY3VtZW50LCBwb2xpY3kubV9nZW9sb2NhdGlvblJ1 bGUsIGl0ZW0uc3Vic3RyaW5nKDEyKSk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg fQogICAgICAgICBpZiAoaXRlbS5zdGFydHNXaXRoKCJzeW5jLXhociIpKSB7CiAgICAgICAgICAg ICBpc1N5bmNYSFJJbml0aWFsaXplZCA9IHRydWU7CiAgICAgICAgICAgICB1cGRhdGVMaXN0KGRv Y3VtZW50LCBwb2xpY3kubV9zeW5jWEhSUnVsZSwgaXRlbS5zdWJzdHJpbmcoOSkpOwpAQCAtMjQ0 LDYgKzI1Miw4IEBAIEZlYXR1cmVQb2xpY3kgRmVhdHVyZVBvbGljeTo6cGFyc2UoRG9jdW1lbnQm IGRvY3VtZW50LCBjb25zdCBIVE1MSUZyYW1lRWxlbWVudCYKICAgICAgICAgcG9saWN5Lm1fc3Bl YWtlclNlbGVjdGlvblJ1bGUuYWxsb3dlZExpc3QuYWRkKGRvY3VtZW50LnNlY3VyaXR5T3JpZ2lu KCkuZGF0YSgpKTsKICAgICBpZiAoIWlzRGlzcGxheUNhcHR1cmVJbml0aWFsaXplZCkKICAgICAg ICAgcG9saWN5Lm1fZGlzcGxheUNhcHR1cmVSdWxlLmFsbG93ZWRMaXN0LmFkZChkb2N1bWVudC5z ZWN1cml0eU9yaWdpbigpLmRhdGEoKSk7CisgICAgaWYgKCFpc0dlb2xvY2F0aW9uSW5pdGlhbGl6 ZWQpCisgICAgICAgIHBvbGljeS5tX2dlb2xvY2F0aW9uUnVsZS5hbGxvd2VkTGlzdC5hZGQoZG9j dW1lbnQuc2VjdXJpdHlPcmlnaW4oKS5kYXRhKCkpOwogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5U QVRJT04pCiAgICAgaWYgKCFpc0d5cm9zY29wZUluaXRpYWxpemVkKQogICAgICAgICBwb2xpY3ku bV9neXJvc2NvcGVSdWxlLmFsbG93ZWRMaXN0LmFkZChkb2N1bWVudC5zZWN1cml0eU9yaWdpbigp LmRhdGEoKSk7CkBAIC0yODksNiArMjk5LDggQEAgYm9vbCBGZWF0dXJlUG9saWN5OjphbGxvd3Mo VHlwZSB0eXBlLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIG9yaWdpbikgY29uc3QKICAgICAg ICAgcmV0dXJuIGlzQWxsb3dlZEJ5RmVhdHVyZVBvbGljeShtX3NwZWFrZXJTZWxlY3Rpb25SdWxl LCBvcmlnaW4pOwogICAgIGNhc2UgVHlwZTo6RGlzcGxheUNhcHR1cmU6CiAgICAgICAgIHJldHVy biBpc0FsbG93ZWRCeUZlYXR1cmVQb2xpY3kobV9kaXNwbGF5Q2FwdHVyZVJ1bGUsIG9yaWdpbik7 CisgICAgY2FzZSBUeXBlOjpHZW9sb2NhdGlvbjoKKyAgICAgICAgcmV0dXJuIGlzQWxsb3dlZEJ5 RmVhdHVyZVBvbGljeShtX2dlb2xvY2F0aW9uUnVsZSwgb3JpZ2luKTsKICAgICBjYXNlIFR5cGU6 OlN5bmNYSFI6CiAgICAgICAgIHJldHVybiBpc0FsbG93ZWRCeUZlYXR1cmVQb2xpY3kobV9zeW5j WEhSUnVsZSwgb3JpZ2luKTsKICAgICBjYXNlIFR5cGU6OkZ1bGxzY3JlZW46CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZlYXR1cmVQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvRmVhdHVyZVBvbGljeS5oCmluZGV4IGVlZGU4ZjE5NzcyMDMxZTEwYjljNGQyOTM4NGIzZDUw YThjN2E5YWMuLjdiNjQ1NjE3MTY1ZjQwMWNlM2JiODAxZDMyMDIwOTU4NzUyMWI2ODQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGljeS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGljeS5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAg ICAgICAgTWljcm9waG9uZSwKICAgICAgICAgU3BlYWtlclNlbGVjdGlvbiwKICAgICAgICAgRGlz cGxheUNhcHR1cmUsCisgICAgICAgIEdlb2xvY2F0aW9uLAogICAgICAgICBTeW5jWEhSLAogICAg ICAgICBGdWxsc2NyZWVuLAogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCkBAIC02Nyw2 ICs2OCw3IEBAIHByaXZhdGU6CiAgICAgQWxsb3dSdWxlIG1fbWljcm9waG9uZVJ1bGU7CiAgICAg QWxsb3dSdWxlIG1fc3BlYWtlclNlbGVjdGlvblJ1bGU7CiAgICAgQWxsb3dSdWxlIG1fZGlzcGxh eUNhcHR1cmVSdWxlOworICAgIEFsbG93UnVsZSBtX2dlb2xvY2F0aW9uUnVsZTsKICAgICBBbGxv d1J1bGUgbV9zeW5jWEhSUnVsZTsKICAgICBBbGxvd1J1bGUgbV9mdWxsc2NyZWVuUnVsZTsKICNp ZiBFTkFCTEUoREVWSUNFX09SSUVOVEFUSU9OKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDgwYjMxNmZhYzViZDA4MmM3MzhlNDFjNmM5YjA3OWIz OTU0NjM3MjIuLjRlZjljZDk3ZTYzNGI2ODIyZThmMzU4MjIxYmFjZTA2NmQ2ZDNkMTAgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAyMS0wMy0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAg ICAgICAgQXBwbHkgcGVybWlzc2lvbiBwb2xpY3kgdG8gZ2VvbG9jYXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzI0OAorCisgICAgICAgIFJl dmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1bR2VvbG9jYXRpb25EZWxlZ2F0 ZU5ldyBzZXRWYWxpZGF0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1bR2VvbG9jYXRpb25EZWxl Z2F0ZU5ldyBfd2ViVmlldzpyZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNzaW9uRm9yT3JpZ2luOmlu aXRpYXRlZEJ5RnJhbWU6ZGVjaXNpb25IYW5kbGVyOl0pOgorICAgICAgICAoLVtHZW9sb2NhdGlv blBlcm1pc3Npb25NZXNzYWdlSGFuZGxlciB1c2VyQ29udGVudENvbnRyb2xsZXI6ZGlkUmVjZWl2 ZVNjcmlwdE1lc3NhZ2U6XSk6CisKIDIwMjEtMDMtMzAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIFByb21vdGUgV0tXZWJWaWV3IGRldmljZSBvcmllbnRhdGlv biBwZXJtaXNzaW9uIGRlbGVnYXRlIHRvIEFQSQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tCmluZGV4IGY1ZmQ3OGVhNzA1MzI4NTg2 ZDgyM2Y5MzFmOTA5ZmNlNDU0ZTkwMDMuLmU1ZDMyZGZhNDIwMmEzOGJmMzliN2FhZjk0ZTA0YTgz MGIzYjA3MzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvVUlEZWxlZ2F0ZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1VJRGVsZWdhdGUubW0KQEAgLTQ5LDYgKzQ5LDcgQEAKICNlbmRpZgogCiBzdGF0aWMgYm9v bCBkb25lOworc3RhdGljIGJvb2wgZGlkUmVjZWl2ZU1lc3NhZ2U7CiAKIEBpbnRlcmZhY2UgQXVk aW9PYnNlcnZlciA6IE5TT2JqZWN0CiBAZW5kCkBAIC0yMTUsMzMgKzIxNiw0MyBAQCBURVNUKFdl YktpdCwgR2VvbG9jYXRpb25QZXJtaXNzaW9uKQogfQogCiBAaW50ZXJmYWNlIEdlb2xvY2F0aW9u RGVsZWdhdGVOZXcgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4KKy0gKHZvaWQpc2V0 VmFsaWRhdGlvbkhhbmRsZXI6KEZ1bmN0aW9uPHZvaWQoV0tTZWN1cml0eU9yaWdpbiosIFdLRnJh bWVJbmZvKik+JiYpdmFsaWRhdGlvbkhhbmRsZXI7CiBAZW5kCiAKLUBpbXBsZW1lbnRhdGlvbiBH ZW9sb2NhdGlvbkRlbGVnYXRlTmV3Ci0tICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJW aWV3IHJlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JPcmlnaW46KFdLU2VjdXJpdHlPcmln aW4qKW9yaWdpbiBpbml0aWF0ZWRCeUZyYW1lOihXS0ZyYW1lSW5mbyAqKWZyYW1lIGRlY2lzaW9u SGFuZGxlcjoodm9pZCAoXikoV0tQZXJtaXNzaW9uRGVjaXNpb24gZGVjaXNpb24pKWRlY2lzaW9u SGFuZGxlciB7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKG9yaWdpbi5wcm90b2NvbCwgQCJodHRwcyIp OwotICAgIEVYUEVDVF9XS19TVFJFUShvcmlnaW4uaG9zdCwgQCIxMjcuMC4wLjEiKTsKLSAgICBF WFBFQ1RfRVEob3JpZ2luLnBvcnQsIDkwOTApOworQGltcGxlbWVudGF0aW9uIEdlb2xvY2F0aW9u RGVsZWdhdGVOZXcgeworICAgIEZ1bmN0aW9uPHZvaWQoV0tTZWN1cml0eU9yaWdpbiosIFdLRnJh bWVJbmZvKik+IF92YWxpZGF0aW9uSGFuZGxlcjsKK30KKy0gKHZvaWQpc2V0VmFsaWRhdGlvbkhh bmRsZXI6KEZ1bmN0aW9uPHZvaWQoV0tTZWN1cml0eU9yaWdpbiosIFdLRnJhbWVJbmZvKik+JiYp dmFsaWRhdGlvbkhhbmRsZXIgeworICAgIF92YWxpZGF0aW9uSGFuZGxlciA9IFdURk1vdmUodmFs aWRhdGlvbkhhbmRsZXIpOworfQogCi0gICAgRVhQRUNUX1dLX1NUUkVRKGZyYW1lLnNlY3VyaXR5 T3JpZ2luLnByb3RvY29sLCBAImh0dHBzIik7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKGZyYW1lLnNl Y3VyaXR5T3JpZ2luLmhvc3QsIEAiMTI3LjAuMC4xIik7Ci0gICAgRVhQRUNUX0VRKGZyYW1lLnNl Y3VyaXR5T3JpZ2luLnBvcnQsIDkwOTEpOwotICAgIEVYUEVDVF9GQUxTRShmcmFtZS5pc01haW5G cmFtZSk7Ci0gICAgRVhQRUNUX1RSVUUoZnJhbWUud2ViVmlldyA9PSB3ZWJWaWV3KTsKKy0gKHZv aWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVxdWVzdEdlb2xvY2F0aW9uUGVybWlz c2lvbkZvck9yaWdpbjooV0tTZWN1cml0eU9yaWdpbiopb3JpZ2luIGluaXRpYXRlZEJ5RnJhbWU6 KFdLRnJhbWVJbmZvICopZnJhbWUgZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShXS1Blcm1pc3Np b25EZWNpc2lvbiBkZWNpc2lvbikpZGVjaXNpb25IYW5kbGVyIHsKKyAgICBpZiAoX3ZhbGlkYXRp b25IYW5kbGVyKQorICAgICAgICBfdmFsaWRhdGlvbkhhbmRsZXIob3JpZ2luLCBmcmFtZSk7CiAK ICAgICBkb25lICA9IHRydWU7CiAgICAgZGVjaXNpb25IYW5kbGVyKFdLUGVybWlzc2lvbkRlY2lz aW9uR3JhbnQpOwogfQogQGVuZAorIAorQGludGVyZmFjZSBHZW9sb2NhdGlvblBlcm1pc3Npb25N ZXNzYWdlSGFuZGxlciA6IE5TT2JqZWN0IDxXS1NjcmlwdE1lc3NhZ2VIYW5kbGVyPgorQGVuZAor CitAaW1wbGVtZW50YXRpb24gR2VvbG9jYXRpb25QZXJtaXNzaW9uTWVzc2FnZUhhbmRsZXIKKy0g KHZvaWQpdXNlckNvbnRlbnRDb250cm9sbGVyOihXS1VzZXJDb250ZW50Q29udHJvbGxlciAqKXVz ZXJDb250ZW50Q29udHJvbGxlciBkaWRSZWNlaXZlU2NyaXB0TWVzc2FnZTooV0tTY3JpcHRNZXNz YWdlICopbWVzc2FnZQoreworICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gdHJ1ZTsKK30KK0BlbmQK IAogc3RhdGljIGNvbnN0IGNoYXIqIG1haW5GcmFtZVRleHQgPSBSIkRPQ0RPQ0RPQygKIDxodG1s Pjxib2R5PgotPGlmcmFtZSBzcmM9J2h0dHBzOi8vMTI3LjAuMC4xOjkwOTEvZnJhbWUnIGFsbG93 PSdjYW1lcmE6aHR0cHM6Ly8xMjcuMC4wLjE6OTA5MSc+PC9pZnJhbWU+Cis8aWZyYW1lIHNyYz0n aHR0cHM6Ly8xMjcuMC4wLjE6OTA5MS9mcmFtZScgYWxsb3c9J2dlb2xvY2F0aW9uOmh0dHBzOi8v MTI3LjAuMC4xOjkwOTEnPjwvaWZyYW1lPgogPC9ib2R5PjwvaHRtbD4KIClET0NET0NET0MiOwog c3RhdGljIGNvbnN0IGNoYXIqIGZyYW1lVGV4dCA9IFIiRE9DRE9DRE9DKAogPGh0bWw+PGJvZHk+ PHNjcmlwdD4KLW5hdmlnYXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oKCkgPT4g eyB9KTsKK25hdmlnYXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oKCkgPT4geyB3 ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCJvayIpIH0sICgp ID0+IHsgd2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgia28i KSB9KTsKIDwvc2NyaXB0PjwvYm9keT48L2h0bWw+CiApRE9DRE9DRE9DIjsKIApAQCAtMjY3LDEw ICsyNzgsMTQgQEAgVEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lvbkluSUZyYW1lKQog CiAgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gYWxsb2NdIGluaXRdKTsKICAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29sID0g cG9vbC5nZXQoKTsKKworICAgIGF1dG8gbWVzc2FnZUhhbmRsZXIgPSBhZG9wdE5TKFtbR2VvbG9j YXRpb25QZXJtaXNzaW9uTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbW2NvbmZp Z3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjpt ZXNzYWdlSGFuZGxlci5nZXQoKSBuYW1lOkAidGVzdEhhbmRsZXIiXTsKKwogICAgIGF1dG8gd2Vi VmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVj dE1ha2UoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0p OwogCi0gICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tHZW9sb2NhdGlvbkRlbGVnYXRlTmV3 IGFsbG9jXSBpbml0XSk7Ci0gICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQo KV07CisgICAgYXV0byBwZXJtaXNzaW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbR2VvbG9jYXRpb25E ZWxlZ2F0ZU5ldyBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6cGVy bWlzc2lvbkRlbGVnYXRlLmdldCgpXTsKIAogICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0g YWRvcHROUyhbVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZSBuZXddKTsKICAgICBbbmF2aWdhdGlvbkRl bGVnYXRlIHNldERpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpeKFdLV2ViVmlldyAq LCBOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICpjaGFsbGVuZ2UsIHZvaWQgKF5jYWxsYmFj aykoTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uLCBOU1VSTENyZWRlbnRpYWwg KikpIHsKQEAgLTI3OSw4ICsyOTQsNzQgQEAgVEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlz c2lvbkluSUZyYW1lKQogICAgIH1dOwogICAgIHdlYlZpZXcuZ2V0KCkubmF2aWdhdGlvbkRlbGVn YXRlID0gbmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpOwogCisgICAgW3Blcm1pc3Npb25EZWxlZ2F0 ZSBzZXRWYWxpZGF0aW9uSGFuZGxlcjpbJndlYlZpZXddKFdLU2VjdXJpdHlPcmlnaW4gKm9yaWdp biwgV0tGcmFtZUluZm8gKmZyYW1lKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShvcmlnaW4u cHJvdG9jb2wsIEAiaHR0cHMiKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKG9yaWdpbi5ob3N0 LCBAIjEyNy4wLjAuMSIpOworICAgICAgICBFWFBFQ1RfRVEob3JpZ2luLnBvcnQsIDkwOTApOwor CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShmcmFtZS5zZWN1cml0eU9yaWdpbi5wcm90b2NvbCwg QCJodHRwcyIpOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZnJhbWUuc2VjdXJpdHlPcmlnaW4u aG9zdCwgQCIxMjcuMC4wLjEiKTsKKyAgICAgICAgRVhQRUNUX0VRKGZyYW1lLnNlY3VyaXR5T3Jp Z2luLnBvcnQsIDkwOTEpOworICAgICAgICBFWFBFQ1RfRkFMU0UoZnJhbWUuaXNNYWluRnJhbWUp OworICAgICAgICBFWFBFQ1RfVFJVRShmcmFtZS53ZWJWaWV3ID09IHdlYlZpZXcpOworICAgIH1d OworCisgICAgZG9uZSA9IGZhbHNlOworICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gZmFsc2U7CiAg ICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6c2VydmVyMS5yZXF1ZXN0KCldOwotICAgIFRlc3RXZWJL aXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZk aWRSZWNlaXZlTWVzc2FnZSk7CisgICAgRVhQRUNUX1RSVUUoZG9uZSk7Cit9CisKK3N0YXRpYyBj b25zdCBjaGFyKiBub3RBbGxvd2luZ01haW5GcmFtZVRleHQgPSBSIkRPQ0RPQ0RPQygKKzxodG1s Pjxib2R5PgorPGlmcmFtZSBzcmM9J2h0dHBzOi8vMTI3LjAuMC4xOjkwOTEvZnJhbWUnIGFsbG93 PSdnZW9sb2NhdGlvbjpodHRwczovLzEyNy4wLjAuMTo5MDkyJz48L2lmcmFtZT4KKzwvYm9keT48 L2h0bWw+CispRE9DRE9DRE9DIjsKKworVEVTVChXZWJLaXQsIEdlb2xvY2F0aW9uUGVybWlzc2lv bkluRGlzYWxsb3dlZElGcmFtZSkKK3sKKyAgICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNl cnZlcjEoeworICAgICAgICB7ICIvIiwgeyBub3RBbGxvd2luZ01haW5GcmFtZVRleHQgfSB9Cisg ICAgfSwgVGVzdFdlYktpdEFQSTo6SFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzLCBudWxscHRy LCBudWxscHRyLCA5MDkwKTsKKworICAgIFRlc3RXZWJLaXRBUEk6OkhUVFBTZXJ2ZXIgc2VydmVy Mih7CisgICAgICAgIHsgIi9mcmFtZSIsIHsgZnJhbWVUZXh0IH0gfSwKKyAgICB9LCBUZXN0V2Vi S2l0QVBJOjpIVFRQU2VydmVyOjpQcm90b2NvbDo6SHR0cHMsIG51bGxwdHIsIG51bGxwdHIsIDkw OTEpOworCisgICAgYXV0byBwb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIGlu aXRdKTsKKworICAgIFdLR2VvbG9jYXRpb25Qcm92aWRlclYxIHByb3ZpZGVyQ2FsbGJhY2s7Cisg ICAgbWVtc2V0KCZwcm92aWRlckNhbGxiYWNrLCAwLCBzaXplb2YoV0tHZW9sb2NhdGlvblByb3Zp ZGVyVjEpKTsKKyAgICBwcm92aWRlckNhbGxiYWNrLmJhc2UudmVyc2lvbiA9IDE7CisgICAgcHJv dmlkZXJDYWxsYmFjay5zdGFydFVwZGF0aW5nID0gW10gKFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVm IG1hbmFnZXIsIGNvbnN0IHZvaWQqKSB7CisgICAgICAgIFdLR2VvbG9jYXRpb25NYW5hZ2VyUHJv dmlkZXJEaWRDaGFuZ2VQb3NpdGlvbihtYW5hZ2VyLCBhZG9wdFdLKFdLR2VvbG9jYXRpb25Qb3Np dGlvbkNyZWF0ZSgwLCA1MC42NDQzNTgsIDMuMzQ1NDUzLCAyLjUzKSkuZ2V0KCkpOworICAgIH07 CisgICAgV0tHZW9sb2NhdGlvbk1hbmFnZXJTZXRQcm92aWRlcihXS0NvbnRleHRHZXRHZW9sb2Nh dGlvbk1hbmFnZXIoKFdLQ29udGV4dFJlZilwb29sLmdldCgpKSwgJnByb3ZpZGVyQ2FsbGJhY2su YmFzZSk7CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29u ZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vz c1Bvb2wgPSBwb29sLmdldCgpOworCisgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMo W1tHZW9sb2NhdGlvblBlcm1pc3Npb25NZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAg IFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3NhZ2VI YW5kbGVyOm1lc3NhZ2VIYW5kbGVyLmdldCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOworCisgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9u LmdldCgpXSk7CisKKyAgICBhdXRvIHBlcm1pc3Npb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tHZW9s b2NhdGlvbkRlbGVnYXRlTmV3IGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0VUlEZWxl Z2F0ZTpwZXJtaXNzaW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgYXV0byBuYXZpZ2F0aW9uRGVs ZWdhdGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOworICAgIFtuYXZp Z2F0aW9uRGVsZWdhdGUgc2V0RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl4oV0tX ZWJWaWV3ICosIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgdm9pZCAo XmNhbGxiYWNrKShOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24sIE5TVVJMQ3Jl ZGVudGlhbCAqKSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoY2hhbGxlbmdlLnByb3RlY3Rp b25TcGFjZS5hdXRoZW50aWNhdGlvbk1ldGhvZCwgTlNVUkxBdXRoZW50aWNhdGlvbk1ldGhvZFNl cnZlclRydXN0KTsKKyAgICAgICAgY2FsbGJhY2soTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZVVz ZUNyZWRlbnRpYWwsIFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlhbEZvclRydXN0OmNoYWxsZW5n ZS5wcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHJ1c3RdKTsKKyAgICB9XTsKKyAgICB3ZWJWaWV3Lmdl dCgpLm5hdmlnYXRpb25EZWxlZ2F0ZSA9IG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKKworICAg IGRvbmUgPSBmYWxzZTsKKyAgICBkaWRSZWNlaXZlTWVzc2FnZSA9IGZhbHNlOworICAgIFt3ZWJW aWV3IGxvYWRSZXF1ZXN0OnNlcnZlcjEucmVxdWVzdCgpXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJmRpZFJlY2VpdmVNZXNzYWdlKTsKKyAgICBFWFBFQ1RfRkFMU0UoZG9uZSk7CiB9 CiAKIEBpbnRlcmZhY2UgSW5qZWN0ZWRCdW5kbGVOb2RlSGFuZGxlSXNTZWxlY3RFbGVtZW50RGVs ZWdhdGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2NWJmMzlhZmJm ZGEwYTFmOWYwNWE4NGE3NTBlODNmMzZmMjYxZDVjLi4yZjQxNDUyODc1ZGNlMWZkZWVmNWU0NzZl OTQyMzMwZjdiZjJiN2ZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDMtMzAgIFlvdWVu biBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFwcGx5IHBlcm1pc3Npb24g cG9saWN5IHRvIGdlb2xvY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjMyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L3NhbmRib3hlZC1pZnJhbWUtZ2VvbG9j YXRpb24tZ2V0Q3VycmVudFBvc2l0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBodHRwL3Rl c3RzL3NlY3VyaXR5L3NhbmRib3hlZC1pZnJhbWUtZ2VvbG9jYXRpb24td2F0Y2hQb3NpdGlvbi1l eHBlY3RlZC50eHQ6CisKIDIwMjEtMDMtMjkgIEFtaXIgTWFyayBKciAgPGFtaXJfbWFya0BhcHBs ZS5jb20+CiAKICAgICAgICAgW01hY09TIERlYnVnXSBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRl bnRTZWN1cml0eVBvbGljeS9mcmFtZS1zcmMtY3Jvc3Mtb3JpZ2luLWxvYWQuaHRtbCBpcyBhIGZs YWtleSBmYWlsdXJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L3NhbmRib3hlZC1pZnJhbWUtZ2VvbG9jYXRpb24tZ2V0Q3VycmVudFBvc2l0aW9uLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvc2FuZGJveGVkLWlmcmFtZS1n ZW9sb2NhdGlvbi1nZXRDdXJyZW50UG9zaXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDlkNjc1YjQz NGJkOGM1ZTU0MjNmYjk2NDdlOTMwZjgxYmMzMzVkMGQuLmM0NGUwOThiNmUzODczY2Y5ZjNhOWI4 OTk4YTZiMmY1MGMyMWJkYWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj dXJpdHkvc2FuZGJveGVkLWlmcmFtZS1nZW9sb2NhdGlvbi1nZXRDdXJyZW50UG9zaXRpb24tZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvc2FuZGJveGVk LWlmcmFtZS1nZW9sb2NhdGlvbi1nZXRDdXJyZW50UG9zaXRpb24tZXhwZWN0ZWQudHh0CkBAIC0x LDMgKzEsNCBAQAorQ09OU09MRSBNRVNTQUdFOiBGZWF0dXJlIHBvbGljeSAnR2VvbG9jYXRpb24n IGNoZWNrIGZhaWxlZCBmb3IgaWZyYW1lIHdpdGggb3JpZ2luICdudWxsJyBhbmQgYWxsb3cgYXR0 cmlidXRlICcnLgogVGVzdHMgdGhhdCBuYXZpZ2F0b3IuZ2VvbG9jYXRpb24uZ2V0Q3VycmVudFBv c2l0aW9uKCkgcmV0dXJucyBlcnJvciBQRVJNSVNTSU9OX0RFTklFRCB3aGVuIGNhbGxlZCBmcm9t IGEgZG9jdW1lbnQgaW4gYSBzYW5kYm94ZWQgaWZyYW1lLgogCiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvc2FuZGJveGVkLWlmcmFtZS1nZW9sb2NhdGlvbi13 YXRjaFBvc2l0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp dHkvc2FuZGJveGVkLWlmcmFtZS1nZW9sb2NhdGlvbi13YXRjaFBvc2l0aW9uLWV4cGVjdGVkLnR4 dAppbmRleCBmMGYxNTcxZGVhNmM3MzlkMWI4YzUyODY3NDQ2YjRmM2ZkZTY0ODQ4Li41OTgzZDZk NWU4MmQwNWE4OTg1ZTdkNGNhY2M1ZTE2OTk1ZTViNjZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3NhbmRib3hlZC1pZnJhbWUtZ2VvbG9jYXRpb24td2F0Y2hQ b3NpdGlvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0 eS9zYW5kYm94ZWQtaWZyYW1lLWdlb2xvY2F0aW9uLXdhdGNoUG9zaXRpb24tZXhwZWN0ZWQudHh0 CkBAIC0xLDMgKzEsNCBAQAorQ09OU09MRSBNRVNTQUdFOiBGZWF0dXJlIHBvbGljeSAnR2VvbG9j YXRpb24nIGNoZWNrIGZhaWxlZCBmb3IgaWZyYW1lIHdpdGggb3JpZ2luICdudWxsJyBhbmQgYWxs b3cgYXR0cmlidXRlICcnLgogVGVzdHMgdGhhdCBuYXZpZ2F0b3IuZ2VvbG9jYXRpb24ud2F0Y2hQ b3NpdGlvbigpIHJldHVybnMgZXJyb3IgUEVSTUlTU0lPTl9ERU5JRUQgd2hlbiBjYWxsZWQgZnJv bSBhIGRvY3VtZW50IGluIGEgc2FuZGJveGVkIGlmcmFtZS4KIAogCg==