222994 2021-03-09 14:45:26 -0800 HTTPS upgrade should allow same-site redirects from HTTPS to HTTP 2021-03-09 21:30:47 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez ews-watchlist ggaren japhet webkit-bug-importer oldest_to_newest 1737771 0 achristensen 2021-03-09 14:45:26 -0800 HTTPS upgrade should allow same-site redirects from HTTPS to HTTP 1737774 1 422763 achristensen 2021-03-09 14:48:57 -0800 Created attachment 422763 Patch 1737777 2 achristensen 2021-03-09 14:49:00 -0800 <rdar://problem/75159643> 1737808 3 422763 ggaren 2021-03-09 15:38:14 -0800 Comment on attachment 422763 Patch r=me 1737916 4 422789 achristensen 2021-03-09 20:32:34 -0800 Created attachment 422789 Patch 1737935 5 ews-feeder 2021-03-09 21:30:44 -0800 Committed r274197: <https://commits.webkit.org/r274197> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422789. 422763 2021-03-09 14:48:57 -0800 2021-03-09 20:32:32 -0800 Patch bug-222994-20210309144856.patch text/plain 7938 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmIzMzhjYWJmNzRiYjc2 MTgyZTA3MWUzOWEyMzk3MDA2ODlkNjFkMi4uNDE5Yjg3NWFkZWNkZGVhNzljZTJjYTE2MWZkODQx ZTgyMDM4NGJiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTA5ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSFRUUFMg dXBncmFkZSBzaG91bGQgYWxsb3cgc2FtZS1zaXRlIHJlZGlyZWN0cyBmcm9tIEhUVFBTIHRvIEhU VFAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjk5 NAorICAgICAgICA8cmRhcjovLzc1MTU5NjQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNldmVyYWwgc2l0ZXMgc3VwcG9ydCBIVFRQUywgYnV0IGhh dmUgY2VydGFpbiBwYWdlcyBvciByZXNvdXJjZXMgdGhhdCBmb3Igc29tZSByZWFzb24gYXJlIG9u bHkgc2VydmVkIG92ZXIgSFRUUC4KKyAgICAgICAgSWYgeW91IHRyeSB0byBsb2FkIHRoZSByZXNv dXJjZSBvdmVyIEhUVFBTLCBpdCB3aWxsIHNpbXBseSByZWRpcmVjdCB5b3UgdG8gSFRUUC4gIElu IG9yZGVyIHRvIGluY3JlYXNlIGNvbXBhdGliaWxpdHkKKyAgICAgICAgd2l0aCB0aGUgd2ViLCB3 ZSBuZWVkIHRvIG5vdCBkbyBpbmZpbml0ZSByZWRpcmVjdCBsb29wcyBpbiB0aGlzIGNhc2UuCisK KyAgICAgICAgVGhlIG5leHQgdmVyc2lvbiBvZiB0aGlzIHBhdGNoIHdpbGwgaGF2ZSBhIHRlc3Qs IGJ1dCBmZWVsIGZyZWUgdG8gcmV2aWV3IHRoZSBjb250ZW50IG9mIHRoaXMgY29kZSBjaGFuZ2Ug YmVmb3JlIHRoZW4uCisKKyAgICAgICAgKiBjb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5z aW9uc0JhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6Om1h a2VTZWN1cmVJZk5lY2Vzc2FyeSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9u czo6Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0Zvckxv YWQpOgorICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2Vu ZC5oOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwpOgorICAgICAgICAq IHBhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29u dGVudFByb3ZpZGVyOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQpOgorICAgICAgICAq IHBhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6VXNlckNvbnRl bnRQcm92aWRlcjo6cHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKToKKwogMjAyMS0wMy0w OSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dl YlJUQ11bR1N0cmVhbWVyXSB3ZWJydGMvbXVsdGktdmlkZW8uaHRtbCBjcmFzaGVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0Jh Y2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVu c2lvbnNCYWNrZW5kLmNwcAppbmRleCBlZDVhZDhhNDkwYTgzMDUwYTI0NWVmZGU0YWEzNmViNmFl NGViMzExLi5iMmY1OGI3Yzg0Mzk1MTBmNWJmZTIwZjU3OWU3Y2MwZmY4YWMzODBhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0Jh Y2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRF eHRlbnNpb25zQmFja2VuZC5jcHAKQEAgLTU3LDggKzU3LDExIEBAIG5hbWVzcGFjZSBDb250ZW50 RXh0ZW5zaW9ucyB7CiAjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdlYktp dEFkZGl0aW9ucy9Db250ZW50UnVsZUxpc3RBZGRpdGlvbnMubW0+CiAjZWxzZQotc3RhdGljIHZv aWQgbWFrZVNlY3VyZUlmTmVjZXNzYXJ5KENvbnRlbnRSdWxlTGlzdFJlc3VsdHMmIHJlc3VsdHMs IGNvbnN0IFVSTCYgdXJsKQorc3RhdGljIHZvaWQgbWFrZVNlY3VyZUlmTmVjZXNzYXJ5KENvbnRl bnRSdWxlTGlzdFJlc3VsdHMmIHJlc3VsdHMsIGNvbnN0IFVSTCYgdXJsLCBjb25zdCBVUkwmIHJl ZGlyZWN0RnJvbSA9IHsgfSkKIHsKKyAgICBpZiAocmVkaXJlY3RGcm9tLmhvc3QoKSA9PSB1cmwu aG9zdCgpICYmIHJlZGlyZWN0RnJvbS5wcm90b2NvbElzKCJodHRwcyIpKQorICAgICAgICByZXR1 cm47CisKICAgICBpZiAodXJsLnByb3RvY29sSXMoImh0dHAiKSAmJiAodXJsLmhvc3QoKSA9PSAi d3d3Lm9wZW5nbC5vcmciIHx8IHVybC5ob3N0KCkgPT0gImRvd25sb2FkIikpCiAgICAgICAgIHJl c3VsdHMuc3VtbWFyeS5tYWRlSFRUUFMgPSB0cnVlOwogfQpAQCAtMTYzLDcgKzE2Niw3IEBAIFN0 eWxlU2hlZXRDb250ZW50cyogQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpnbG9iYWxEaXNwbGF5 Tm9uZVN0eWxlU2hlZXQoY29uc3QKICAgICByZXR1cm4gY29udGVudEV4dGVuc2lvbiA/IGNvbnRl bnRFeHRlbnNpb24tPmdsb2JhbERpc3BsYXlOb25lU3R5bGVTaGVldCgpIDogbnVsbHB0cjsKIH0K IAotQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6OnByb2Nl c3NDb250ZW50UnVsZUxpc3RzRm9yTG9hZChQYWdlJiBwYWdlLCBjb25zdCBVUkwmIHVybCwgT3B0 aW9uU2V0PFJlc291cmNlVHlwZT4gcmVzb3VyY2VUeXBlLCBEb2N1bWVudExvYWRlciYgaW5pdGlh dGluZ0RvY3VtZW50TG9hZGVyKQorQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBDb250ZW50RXh0ZW5z aW9uc0JhY2tlbmQ6OnByb2Nlc3NDb250ZW50UnVsZUxpc3RzRm9yTG9hZChQYWdlJiBwYWdlLCBj b25zdCBVUkwmIHVybCwgT3B0aW9uU2V0PFJlc291cmNlVHlwZT4gcmVzb3VyY2VUeXBlLCBEb2N1 bWVudExvYWRlciYgaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyLCBjb25zdCBVUkwmIHJlZGlyZWN0 RnJvbSkKIHsKICAgICBEb2N1bWVudCogY3VycmVudERvY3VtZW50ID0gbnVsbHB0cjsKICAgICBV UkwgbWFpbkRvY3VtZW50VVJMOwpAQCAtMTg0LDcgKzE4Nyw3IEBAIENvbnRlbnRSdWxlTGlzdFJl c3VsdHMgQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0Zv ckxvYWQoCiAKICAgICBDb250ZW50UnVsZUxpc3RSZXN1bHRzIHJlc3VsdHM7CiAgICAgaWYgKHBh Z2UuaHR0cHNVcGdyYWRlRW5hYmxlZCgpKQotICAgICAgICBtYWtlU2VjdXJlSWZOZWNlc3Nhcnko cmVzdWx0cywgdXJsKTsKKyAgICAgICAgbWFrZVNlY3VyZUlmTmVjZXNzYXJ5KHJlc3VsdHMsIHVy bCwgcmVkaXJlY3RGcm9tKTsKICAgICByZXN1bHRzLnJlc3VsdHMucmVzZXJ2ZUluaXRpYWxDYXBh Y2l0eShhY3Rpb25zLnNpemUoKSk7CiAgICAgZm9yIChjb25zdCBhdXRvJiBhY3Rpb25zRnJvbUNv bnRlbnRSdWxlTGlzdCA6IGFjdGlvbnMpIHsKICAgICAgICAgY29uc3QgU3RyaW5nJiBjb250ZW50 UnVsZUxpc3RJZGVudGlmaWVyID0gYWN0aW9uc0Zyb21Db250ZW50UnVsZUxpc3QuY29udGVudFJ1 bGVMaXN0SWRlbnRpZmllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRl bnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oIGIvU291cmNlL1dlYkNvcmUvY29udGVu dGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmgKaW5kZXggYTYzMWZjMDc2MGQ4 ODIzM2E4Nzg1YTkzZWJjMDc2N2FhNTA2NDUzZS4uMWYxOGE1YjViNDhlNTMyYzc4NTFiNGRjYWIw NTRmMGY0NGI1ZjQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lv bnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY29udGVu dGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmgKQEAgLTYzLDcgKzYzLDcgQEAg cHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIFZlY3RvcjxBY3Rpb25zRnJvbUNvbnRlbnRSdWxl TGlzdD4gYWN0aW9uc0ZvclJlc291cmNlTG9hZChjb25zdCBSZXNvdXJjZUxvYWRJbmZvJikgY29u c3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgU3R5bGVTaGVldENvbnRlbnRzKiBnbG9iYWxEaXNwbGF5 Tm9uZVN0eWxlU2hlZXQoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKSBjb25zdDsKIAotICAgIENv bnRlbnRSdWxlTGlzdFJlc3VsdHMgcHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKFBhZ2Um LCBjb25zdCBVUkwmLCBPcHRpb25TZXQ8UmVzb3VyY2VUeXBlPiwgRG9jdW1lbnRMb2FkZXImIGlu aXRpYXRpbmdEb2N1bWVudExvYWRlcik7CisgICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBwcm9j ZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQoUGFnZSYsIGNvbnN0IFVSTCYsIE9wdGlvblNldDxS ZXNvdXJjZVR5cGU+LCBEb2N1bWVudExvYWRlciYgaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyLCBj b25zdCBVUkwmIHJlZGlyZWN0RnJvbSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgQ29udGVudFJ1bGVM aXN0UmVzdWx0cyBwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvclBpbmdMb2FkKGNvbnN0IFVSTCYs IGNvbnN0IFVSTCYgbWFpbkRvY3VtZW50VVJMKTsKIAogICAgIHN0YXRpYyBjb25zdCBTdHJpbmcm IGRpc3BsYXlOb25lQ1NTUnVsZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRl ci5jcHAKaW5kZXggMDM3YTM4NDE5OTQ3OGNlYTRiYjUyOGM0ODNjMWM0MDk4MjJjNmMxYi4uMmFm ZGYxZWQ0ZGNkYzhmNGYwMDdjYjczN2FhM2U1MGY1MWE5MzU3ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0zNTUsNyArMzU1LDcgQEAgdm9pZCBSZXNvdXJj ZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVz dCwgY29uc3QgUmUKICAgICBpZiAoIXJlZGlyZWN0UmVzcG9uc2UuaXNOdWxsKCkgJiYgZnJhbWVM b2FkZXIoKSkgewogICAgICAgICBQYWdlKiBwYWdlID0gZnJhbWVMb2FkZXIoKS0+ZnJhbWUoKS5w YWdlKCk7CiAgICAgICAgIGlmIChwYWdlICYmIG1fZG9jdW1lbnRMb2FkZXIpIHsKLSAgICAgICAg ICAgIGF1dG8gcmVzdWx0cyA9IHBhZ2UtPnVzZXJDb250ZW50UHJvdmlkZXIoKS5wcm9jZXNzQ29u dGVudFJ1bGVMaXN0c0ZvckxvYWQoKnBhZ2UsIHJlcXVlc3QudXJsKCksIG1fcmVzb3VyY2VUeXBl LCAqbV9kb2N1bWVudExvYWRlcik7CisgICAgICAgICAgICBhdXRvIHJlc3VsdHMgPSBwYWdlLT51 c2VyQ29udGVudFByb3ZpZGVyKCkucHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKCpwYWdl LCByZXF1ZXN0LnVybCgpLCBtX3Jlc291cmNlVHlwZSwgKm1fZG9jdW1lbnRMb2FkZXIsIHJlZGly ZWN0UmVzcG9uc2UudXJsKCkpOwogICAgICAgICAgICAgYm9vbCBibG9ja2VkTG9hZCA9IHJlc3Vs dHMuc3VtbWFyeS5ibG9ja2VkTG9hZDsKICAgICAgICAgICAgIENvbnRlbnRFeHRlbnNpb25zOjph cHBseVJlc3VsdHNUb1JlcXVlc3QoV1RGTW92ZShyZXN1bHRzKSwgcGFnZSwgcmVxdWVzdCk7CiAg ICAgICAgICAgICBpZiAoYmxvY2tlZExvYWQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJD b250ZW50UHJvdmlkZXIuY3BwCmluZGV4IDliNzBiYmUyNTYwMmM4YmI2NGRiNmQzZWM2OGEzNDA4 YWRjNTZlY2QuLjFhNmFlY2U0YWUyZDU2Y2UxNDc1NGMwZWY1NzAzNzE3NzRlNjYwNzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudFByb3ZpZGVyLmNwcApAQCAtMTAyLDEyICsx MDIsMTIgQEAgc3RhdGljIGJvb2wgY29udGVudFJ1bGVMaXN0c0VuYWJsZWQoY29uc3QgRG9jdW1l bnRMb2FkZXImIGRvY3VtZW50TG9hZGVyKQogICAgIHJldHVybiB0cnVlOwogfQogICAgIAotQ29u dGVudFJ1bGVMaXN0UmVzdWx0cyBVc2VyQ29udGVudFByb3ZpZGVyOjpwcm9jZXNzQ29udGVudFJ1 bGVMaXN0c0ZvckxvYWQoUGFnZSYgcGFnZSwgY29uc3QgVVJMJiB1cmwsIE9wdGlvblNldDxDb250 ZW50RXh0ZW5zaW9uczo6UmVzb3VyY2VUeXBlPiByZXNvdXJjZVR5cGUsIERvY3VtZW50TG9hZGVy JiBpbml0aWF0aW5nRG9jdW1lbnRMb2FkZXIpCitDb250ZW50UnVsZUxpc3RSZXN1bHRzIFVzZXJD b250ZW50UHJvdmlkZXI6OnByb2Nlc3NDb250ZW50UnVsZUxpc3RzRm9yTG9hZChQYWdlJiBwYWdl LCBjb25zdCBVUkwmIHVybCwgT3B0aW9uU2V0PENvbnRlbnRFeHRlbnNpb25zOjpSZXNvdXJjZVR5 cGU+IHJlc291cmNlVHlwZSwgRG9jdW1lbnRMb2FkZXImIGluaXRpYXRpbmdEb2N1bWVudExvYWRl ciwgY29uc3QgVVJMJiByZWRpcmVjdEZyb20pCiB7CiAgICAgaWYgKCFjb250ZW50UnVsZUxpc3Rz RW5hYmxlZChpbml0aWF0aW5nRG9jdW1lbnRMb2FkZXIpKQogICAgICAgICByZXR1cm4geyB9Owog Ci0gICAgcmV0dXJuIHVzZXJDb250ZW50RXh0ZW5zaW9uQmFja2VuZCgpLnByb2Nlc3NDb250ZW50 UnVsZUxpc3RzRm9yTG9hZChwYWdlLCB1cmwsIHJlc291cmNlVHlwZSwgaW5pdGlhdGluZ0RvY3Vt ZW50TG9hZGVyKTsKKyAgICByZXR1cm4gdXNlckNvbnRlbnRFeHRlbnNpb25CYWNrZW5kKCkucHJv Y2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKHBhZ2UsIHVybCwgcmVzb3VyY2VUeXBlLCBpbml0 aWF0aW5nRG9jdW1lbnRMb2FkZXIsIHJlZGlyZWN0RnJvbSk7CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudFByb3ZpZGVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1VzZXJDb250ZW50UHJvdmlkZXIuaAppbmRleCA1NWVjMzg2YzUzMWMxZmRh ZGY0MTE2MjI3NzgyNjlmMjZhZGZhMzgzLi4yNGJiMzYyZjRlOTk2YWRkYWZhZDBmMThjM2YzYTlj MjNhYTcyM2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50UHJv dmlkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50UHJvdmlkZXIuaApA QCAtODgsNyArODgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVQYWdlKFBhZ2UmKTsKIAog I2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCi0gICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0 cyBwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQoUGFnZSYsIGNvbnN0IFVSTCYsIE9wdGlv blNldDxDb250ZW50RXh0ZW5zaW9uczo6UmVzb3VyY2VUeXBlPiwgRG9jdW1lbnRMb2FkZXImIGlu aXRpYXRpbmdEb2N1bWVudExvYWRlcik7CisgICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBwcm9j ZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQoUGFnZSYsIGNvbnN0IFVSTCYsIE9wdGlvblNldDxD b250ZW50RXh0ZW5zaW9uczo6UmVzb3VyY2VUeXBlPiwgRG9jdW1lbnRMb2FkZXImIGluaXRpYXRp bmdEb2N1bWVudExvYWRlciwgY29uc3QgVVJMJiByZWRpcmVjdEZyb20gPSB7IH0pOwogI2VuZGlm CiAKIHByb3RlY3RlZDoK 422789 2021-03-09 20:32:34 -0800 2021-03-09 21:30:45 -0800 Patch bug-222994-20210309203233.patch text/plain 12358 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmIzMzhjYWJmNzRiYjc2 MTgyZTA3MWUzOWEyMzk3MDA2ODlkNjFkMi4uYWViYWFjNWFlMzBmY2VjZjQ4ZDE5ZjRiNjIwM2Rk ZDgzYjU3ZmUwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTA5ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSFRUUFMg dXBncmFkZSBzaG91bGQgYWxsb3cgc2FtZS1zaXRlIHJlZGlyZWN0cyBmcm9tIEhUVFBTIHRvIEhU VFAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjk5 NAorICAgICAgICA8cmRhcjovLzc1MTU5NjQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2Zm IEdhcmVuLgorCisgICAgICAgIFNldmVyYWwgc2l0ZXMgc3VwcG9ydCBIVFRQUywgYnV0IGhhdmUg Y2VydGFpbiBwYWdlcyBvciByZXNvdXJjZXMgdGhhdCBmb3Igc29tZSByZWFzb24gYXJlIG9ubHkg c2VydmVkIG92ZXIgSFRUUC4KKyAgICAgICAgSWYgeW91IHRyeSB0byBsb2FkIHRoZSByZXNvdXJj ZSBvdmVyIEhUVFBTLCBpdCB3aWxsIHNpbXBseSByZWRpcmVjdCB5b3UgdG8gSFRUUC4gIEluIG9y ZGVyIHRvIGluY3JlYXNlIGNvbXBhdGliaWxpdHkKKyAgICAgICAgd2l0aCB0aGUgd2ViLCB3ZSBu ZWVkIHRvIG5vdCBkbyBpbmZpbml0ZSByZWRpcmVjdCBsb29wcyBpbiB0aGlzIGNhc2UuCisKKyAg ICAgICAgVGhlIG5leHQgdmVyc2lvbiBvZiB0aGlzIHBhdGNoIHdpbGwgaGF2ZSBhIHRlc3QsIGJ1 dCBmZWVsIGZyZWUgdG8gcmV2aWV3IHRoZSBjb250ZW50IG9mIHRoaXMgY29kZSBjaGFuZ2UgYmVm b3JlIHRoZW4uCisKKyAgICAgICAgKiBjb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9u c0JhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6Om1ha2VT ZWN1cmVJZk5lY2Vzc2FyeSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6 Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQp OgorICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5o OgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwpOgorICAgICAgICAqIHBh Z2UvVXNlckNvbnRlbnRQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVu dFByb3ZpZGVyOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQpOgorICAgICAgICAqIHBh Z2UvVXNlckNvbnRlbnRQcm92aWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6VXNlckNvbnRlbnRQ cm92aWRlcjo6cHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKToKKwogMjAyMS0wMy0wOSAg UGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dlYlJU Q11bR1N0cmVhbWVyXSB3ZWJydGMvbXVsdGktdmlkZW8uaHRtbCBjcmFzaGVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tl bmQuY3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lv bnNCYWNrZW5kLmNwcAppbmRleCBlZDVhZDhhNDkwYTgzMDUwYTI0NWVmZGU0YWEzNmViNmFlNGVi MzExLi5iMmY1OGI3Yzg0Mzk1MTBmNWJmZTIwZjU3OWU3Y2MwZmY4YWMzODBhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tl bmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRl bnNpb25zQmFja2VuZC5jcHAKQEAgLTU3LDggKzU3LDExIEBAIG5hbWVzcGFjZSBDb250ZW50RXh0 ZW5zaW9ucyB7CiAjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdlYktpdEFk ZGl0aW9ucy9Db250ZW50UnVsZUxpc3RBZGRpdGlvbnMubW0+CiAjZWxzZQotc3RhdGljIHZvaWQg bWFrZVNlY3VyZUlmTmVjZXNzYXJ5KENvbnRlbnRSdWxlTGlzdFJlc3VsdHMmIHJlc3VsdHMsIGNv bnN0IFVSTCYgdXJsKQorc3RhdGljIHZvaWQgbWFrZVNlY3VyZUlmTmVjZXNzYXJ5KENvbnRlbnRS dWxlTGlzdFJlc3VsdHMmIHJlc3VsdHMsIGNvbnN0IFVSTCYgdXJsLCBjb25zdCBVUkwmIHJlZGly ZWN0RnJvbSA9IHsgfSkKIHsKKyAgICBpZiAocmVkaXJlY3RGcm9tLmhvc3QoKSA9PSB1cmwuaG9z dCgpICYmIHJlZGlyZWN0RnJvbS5wcm90b2NvbElzKCJodHRwcyIpKQorICAgICAgICByZXR1cm47 CisKICAgICBpZiAodXJsLnByb3RvY29sSXMoImh0dHAiKSAmJiAodXJsLmhvc3QoKSA9PSAid3d3 Lm9wZW5nbC5vcmciIHx8IHVybC5ob3N0KCkgPT0gImRvd25sb2FkIikpCiAgICAgICAgIHJlc3Vs dHMuc3VtbWFyeS5tYWRlSFRUUFMgPSB0cnVlOwogfQpAQCAtMTYzLDcgKzE2Niw3IEBAIFN0eWxl U2hlZXRDb250ZW50cyogQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpnbG9iYWxEaXNwbGF5Tm9u ZVN0eWxlU2hlZXQoY29uc3QKICAgICByZXR1cm4gY29udGVudEV4dGVuc2lvbiA/IGNvbnRlbnRF eHRlbnNpb24tPmdsb2JhbERpc3BsYXlOb25lU3R5bGVTaGVldCgpIDogbnVsbHB0cjsKIH0KIAot Q29udGVudFJ1bGVMaXN0UmVzdWx0cyBDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6OnByb2Nlc3ND b250ZW50UnVsZUxpc3RzRm9yTG9hZChQYWdlJiBwYWdlLCBjb25zdCBVUkwmIHVybCwgT3B0aW9u U2V0PFJlc291cmNlVHlwZT4gcmVzb3VyY2VUeXBlLCBEb2N1bWVudExvYWRlciYgaW5pdGlhdGlu Z0RvY3VtZW50TG9hZGVyKQorQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBDb250ZW50RXh0ZW5zaW9u c0JhY2tlbmQ6OnByb2Nlc3NDb250ZW50UnVsZUxpc3RzRm9yTG9hZChQYWdlJiBwYWdlLCBjb25z dCBVUkwmIHVybCwgT3B0aW9uU2V0PFJlc291cmNlVHlwZT4gcmVzb3VyY2VUeXBlLCBEb2N1bWVu dExvYWRlciYgaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyLCBjb25zdCBVUkwmIHJlZGlyZWN0RnJv bSkKIHsKICAgICBEb2N1bWVudCogY3VycmVudERvY3VtZW50ID0gbnVsbHB0cjsKICAgICBVUkwg bWFpbkRvY3VtZW50VVJMOwpAQCAtMTg0LDcgKzE4Nyw3IEBAIENvbnRlbnRSdWxlTGlzdFJlc3Vs dHMgQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0Zvckxv YWQoCiAKICAgICBDb250ZW50UnVsZUxpc3RSZXN1bHRzIHJlc3VsdHM7CiAgICAgaWYgKHBhZ2Uu aHR0cHNVcGdyYWRlRW5hYmxlZCgpKQotICAgICAgICBtYWtlU2VjdXJlSWZOZWNlc3NhcnkocmVz dWx0cywgdXJsKTsKKyAgICAgICAgbWFrZVNlY3VyZUlmTmVjZXNzYXJ5KHJlc3VsdHMsIHVybCwg cmVkaXJlY3RGcm9tKTsKICAgICByZXN1bHRzLnJlc3VsdHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0 eShhY3Rpb25zLnNpemUoKSk7CiAgICAgZm9yIChjb25zdCBhdXRvJiBhY3Rpb25zRnJvbUNvbnRl bnRSdWxlTGlzdCA6IGFjdGlvbnMpIHsKICAgICAgICAgY29uc3QgU3RyaW5nJiBjb250ZW50UnVs ZUxpc3RJZGVudGlmaWVyID0gYWN0aW9uc0Zyb21Db250ZW50UnVsZUxpc3QuY29udGVudFJ1bGVM aXN0SWRlbnRpZmllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNp b25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4 dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmgKaW5kZXggYTYzMWZjMDc2MGQ4ODIz M2E4Nzg1YTkzZWJjMDc2N2FhNTA2NDUzZS4uMWYxOGE1YjViNDhlNTMyYzc4NTFiNGRjYWIwNTRm MGY0NGI1ZjQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMv Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4 dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmgKQEAgLTYzLDcgKzYzLDcgQEAgcHVi bGljOgogICAgIFdFQkNPUkVfRVhQT1JUIFZlY3RvcjxBY3Rpb25zRnJvbUNvbnRlbnRSdWxlTGlz dD4gYWN0aW9uc0ZvclJlc291cmNlTG9hZChjb25zdCBSZXNvdXJjZUxvYWRJbmZvJikgY29uc3Q7 CiAgICAgV0VCQ09SRV9FWFBPUlQgU3R5bGVTaGVldENvbnRlbnRzKiBnbG9iYWxEaXNwbGF5Tm9u ZVN0eWxlU2hlZXQoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKSBjb25zdDsKIAotICAgIENvbnRl bnRSdWxlTGlzdFJlc3VsdHMgcHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKFBhZ2UmLCBj b25zdCBVUkwmLCBPcHRpb25TZXQ8UmVzb3VyY2VUeXBlPiwgRG9jdW1lbnRMb2FkZXImIGluaXRp YXRpbmdEb2N1bWVudExvYWRlcik7CisgICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBwcm9jZXNz Q29udGVudFJ1bGVMaXN0c0ZvckxvYWQoUGFnZSYsIGNvbnN0IFVSTCYsIE9wdGlvblNldDxSZXNv dXJjZVR5cGU+LCBEb2N1bWVudExvYWRlciYgaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyLCBjb25z dCBVUkwmIHJlZGlyZWN0RnJvbSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgQ29udGVudFJ1bGVMaXN0 UmVzdWx0cyBwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvclBpbmdMb2FkKGNvbnN0IFVSTCYsIGNv bnN0IFVSTCYgbWFpbkRvY3VtZW50VVJMKTsKIAogICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIGRp c3BsYXlOb25lQ1NTUnVsZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5j cHAKaW5kZXggMDM3YTM4NDE5OTQ3OGNlYTRiYjUyOGM0ODNjMWM0MDk4MjJjNmMxYi4uMmFmZGYx ZWQ0ZGNkYzhmNGYwMDdjYjczN2FhM2U1MGY1MWE5MzU3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0zNTUsNyArMzU1LDcgQEAgdm9pZCBSZXNvdXJjZUxv YWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwg Y29uc3QgUmUKICAgICBpZiAoIXJlZGlyZWN0UmVzcG9uc2UuaXNOdWxsKCkgJiYgZnJhbWVMb2Fk ZXIoKSkgewogICAgICAgICBQYWdlKiBwYWdlID0gZnJhbWVMb2FkZXIoKS0+ZnJhbWUoKS5wYWdl KCk7CiAgICAgICAgIGlmIChwYWdlICYmIG1fZG9jdW1lbnRMb2FkZXIpIHsKLSAgICAgICAgICAg IGF1dG8gcmVzdWx0cyA9IHBhZ2UtPnVzZXJDb250ZW50UHJvdmlkZXIoKS5wcm9jZXNzQ29udGVu dFJ1bGVMaXN0c0ZvckxvYWQoKnBhZ2UsIHJlcXVlc3QudXJsKCksIG1fcmVzb3VyY2VUeXBlLCAq bV9kb2N1bWVudExvYWRlcik7CisgICAgICAgICAgICBhdXRvIHJlc3VsdHMgPSBwYWdlLT51c2Vy Q29udGVudFByb3ZpZGVyKCkucHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKCpwYWdlLCBy ZXF1ZXN0LnVybCgpLCBtX3Jlc291cmNlVHlwZSwgKm1fZG9jdW1lbnRMb2FkZXIsIHJlZGlyZWN0 UmVzcG9uc2UudXJsKCkpOwogICAgICAgICAgICAgYm9vbCBibG9ja2VkTG9hZCA9IHJlc3VsdHMu c3VtbWFyeS5ibG9ja2VkTG9hZDsKICAgICAgICAgICAgIENvbnRlbnRFeHRlbnNpb25zOjphcHBs eVJlc3VsdHNUb1JlcXVlc3QoV1RGTW92ZShyZXN1bHRzKSwgcGFnZSwgcmVxdWVzdCk7CiAgICAg ICAgICAgICBpZiAoYmxvY2tlZExvYWQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvVXNlckNvbnRlbnRQcm92aWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250 ZW50UHJvdmlkZXIuY3BwCmluZGV4IDliNzBiYmUyNTYwMmM4YmI2NGRiNmQzZWM2OGEzNDA4YWRj NTZlY2QuLjFhNmFlY2U0YWUyZDU2Y2UxNDc1NGMwZWY1NzAzNzE3NzRlNjYwNzQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudFByb3ZpZGVyLmNwcApAQCAtMTAyLDEyICsxMDIs MTIgQEAgc3RhdGljIGJvb2wgY29udGVudFJ1bGVMaXN0c0VuYWJsZWQoY29uc3QgRG9jdW1lbnRM b2FkZXImIGRvY3VtZW50TG9hZGVyKQogICAgIHJldHVybiB0cnVlOwogfQogICAgIAotQ29udGVu dFJ1bGVMaXN0UmVzdWx0cyBVc2VyQ29udGVudFByb3ZpZGVyOjpwcm9jZXNzQ29udGVudFJ1bGVM aXN0c0ZvckxvYWQoUGFnZSYgcGFnZSwgY29uc3QgVVJMJiB1cmwsIE9wdGlvblNldDxDb250ZW50 RXh0ZW5zaW9uczo6UmVzb3VyY2VUeXBlPiByZXNvdXJjZVR5cGUsIERvY3VtZW50TG9hZGVyJiBp bml0aWF0aW5nRG9jdW1lbnRMb2FkZXIpCitDb250ZW50UnVsZUxpc3RSZXN1bHRzIFVzZXJDb250 ZW50UHJvdmlkZXI6OnByb2Nlc3NDb250ZW50UnVsZUxpc3RzRm9yTG9hZChQYWdlJiBwYWdlLCBj b25zdCBVUkwmIHVybCwgT3B0aW9uU2V0PENvbnRlbnRFeHRlbnNpb25zOjpSZXNvdXJjZVR5cGU+ IHJlc291cmNlVHlwZSwgRG9jdW1lbnRMb2FkZXImIGluaXRpYXRpbmdEb2N1bWVudExvYWRlciwg Y29uc3QgVVJMJiByZWRpcmVjdEZyb20pCiB7CiAgICAgaWYgKCFjb250ZW50UnVsZUxpc3RzRW5h YmxlZChpbml0aWF0aW5nRG9jdW1lbnRMb2FkZXIpKQogICAgICAgICByZXR1cm4geyB9OwogCi0g ICAgcmV0dXJuIHVzZXJDb250ZW50RXh0ZW5zaW9uQmFja2VuZCgpLnByb2Nlc3NDb250ZW50UnVs ZUxpc3RzRm9yTG9hZChwYWdlLCB1cmwsIHJlc291cmNlVHlwZSwgaW5pdGlhdGluZ0RvY3VtZW50 TG9hZGVyKTsKKyAgICByZXR1cm4gdXNlckNvbnRlbnRFeHRlbnNpb25CYWNrZW5kKCkucHJvY2Vz c0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKHBhZ2UsIHVybCwgcmVzb3VyY2VUeXBlLCBpbml0aWF0 aW5nRG9jdW1lbnRMb2FkZXIsIHJlZGlyZWN0RnJvbSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudFByb3ZpZGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1VzZXJDb250ZW50UHJvdmlkZXIuaAppbmRleCA1NWVjMzg2YzUzMWMxZmRhZGY0 MTE2MjI3NzgyNjlmMjZhZGZhMzgzLi4yNGJiMzYyZjRlOTk2YWRkYWZhZDBmMThjM2YzYTljMjNh YTcyM2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50UHJvdmlk ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50UHJvdmlkZXIuaApAQCAt ODgsNyArODgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVQYWdlKFBhZ2UmKTsKIAogI2lm IEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCi0gICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBw cm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQoUGFnZSYsIGNvbnN0IFVSTCYsIE9wdGlvblNl dDxDb250ZW50RXh0ZW5zaW9uczo6UmVzb3VyY2VUeXBlPiwgRG9jdW1lbnRMb2FkZXImIGluaXRp YXRpbmdEb2N1bWVudExvYWRlcik7CisgICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBwcm9jZXNz Q29udGVudFJ1bGVMaXN0c0ZvckxvYWQoUGFnZSYsIGNvbnN0IFVSTCYsIE9wdGlvblNldDxDb250 ZW50RXh0ZW5zaW9uczo6UmVzb3VyY2VUeXBlPiwgRG9jdW1lbnRMb2FkZXImIGluaXRpYXRpbmdE b2N1bWVudExvYWRlciwgY29uc3QgVVJMJiByZWRpcmVjdEZyb20gPSB7IH0pOwogI2VuZGlmCiAK IHByb3RlY3RlZDoKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCAwYWNiMzI4NDUyYTIzNTk2YWYxMWI4N2ZhYzI2Y2VmOWFmNzkxMDYyLi4yODAyYzk4 ZTA2MWE3ZmVlODFmNzMxYTk4MjllODE2MzU4MzcxZWNkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMDkg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBI VFRQUyB1cGdyYWRlIHNob3VsZCBhbGxvdyBzYW1lLXNpdGUgcmVkaXJlY3RzIGZyb20gSFRUUFMg dG8gSFRUUAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjIyOTk0CisgICAgICAgIDxyZGFyOi8vNzUxNTk2NDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg R2VvZmYgR2FyZW4uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L0NvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbi5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIx LTAzLTA5ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1N0cmVhbWVyXVtXZWJSVENdIFZpZGVvRW5jb2RlciBzdGlsbCBkb2Vzbid0IGNvbXBseSB3 aXRoIFdlYktpdCBzdHlsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Db250ZW50UnVsZUxpc3ROb3RpZmljYXRpb24ubW0gYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbi5tbQpp bmRleCA1N2UwNGFmYmYxOGQ3MDBiY2UxMWRkMmRmN2FiZTQwZjU1ZDI3MjkxLi43OTQ2MzNkYTMw NDlhZTM2ZThiNTMxNTI2MjA3NjAyN2Y3NGE4OWZlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbi5tbQor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRlbnRSdWxlTGlz dE5vdGlmaWNhdGlvbi5tbQpAQCAtMjcsNyArMjcsOSBAQAogCiAjaW1wb3J0ICJIVFRQU2VydmVy LmgiCiAjaW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5oIgorI2ltcG9ydCAiVENQU2VydmVyLmgi CiAjaW1wb3J0ICJUZXN0LmgiCisjaW1wb3J0ICJUZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgiCiAj aW1wb3J0ICJUZXN0VUlEZWxlZ2F0ZS5oIgogI2ltcG9ydCAiVGVzdFVSTFNjaGVtZUhhbmRsZXIu aCIKICNpbXBvcnQgPFdlYktpdC9XS0NvbnRlbnRSdWxlTGlzdFByaXZhdGUuaD4KQEAgLTM2LDcg KzM4LDkgQEAKICNpbXBvcnQgPFdlYktpdC9XS1VSTFNjaGVtZUhhbmRsZXIuaD4KICNpbXBvcnQg PFdlYktpdC9XS1VzZXJDb250ZW50Q29udHJvbGxlci5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2Vi Vmlldy5oPgorI2ltcG9ydCA8V2ViS2l0L1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaD4KICNp bXBvcnQgPFdlYktpdC9fV0tDb250ZW50UnVsZUxpc3RBY3Rpb24uaD4KKyNpbXBvcnQgPFdlYktp dC9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oPgogI2ltcG9ydCA8d3RmL1JldGFp blB0ci5oPgogI2ltcG9ydCA8d3RmL1NIQTEuaD4KICNpbXBvcnQgPHd0Zi9VUkwuaD4KQEAgLTI5 NywzICszMDEsNTEgQEAgVEVTVChDb250ZW50UnVsZUxpc3QsIFN1cHBvcnRzUmVnZXgpCiAgICAg Zm9yIChOU1N0cmluZyAqcmVnZXggaW4gZGlzYWxsb3dlZCkKICAgICAgICAgRVhQRUNUX0ZBTFNF KFtXS0NvbnRlbnRSdWxlTGlzdCBfc3VwcG9ydHNSZWd1bGFyRXhwcmVzc2lvbjpyZWdleF0pOwog fQorCisjaWYgSEFWRShTU0wpCisKK1RFU1QoV2ViS2l0LCBSZWRpcmVjdFRvUGxhaW50ZXh0SFRU UFNVcGdyYWRlKQoreworICAgIHVzaW5nIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJOworICAgIFRD UFNlcnZlciBzZXJ2ZXIoW2Nvbm5lY3Rpb25Db3VudCA9IDBdIChpbnQgc29ja2V0KSBtdXRhYmxl IHsKKyAgICAgICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7CisgICAgICAgIGlmICghY29ubmVj dGlvbkNvdW50KyspIHsKKyAgICAgICAgICAgIGNvbnN0IGNoYXIqIGNvbm5lY3Rpb25Fc3RhYmxp c2hlZCA9CisgICAgICAgICAgICAgICAgIkhUVFAvMS4xIDIwMCBDb25uZWN0aW9uIEVzdGFibGlz aGVkXHJcbiIKKyAgICAgICAgICAgICAgICAiQ29ubmVjdGlvbjogY2xvc2VcclxuIgorICAgICAg ICAgICAgICAgICJcclxuIjsKKyAgICAgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCBj b25uZWN0aW9uRXN0YWJsaXNoZWQsIHN0cmxlbihjb25uZWN0aW9uRXN0YWJsaXNoZWQpKTsKKyAg ICAgICAgICAgIFRDUFNlcnZlcjo6c3RhcnRTZWN1cmVDb25uZWN0aW9uKHNvY2tldCwgW10gKFNT TCogc3NsKSB7CisgICAgICAgICAgICAgICAgVENQU2VydmVyOjpyZWFkKHNzbCk7CisgICAgICAg ICAgICAgICAgY29uc3QgY2hhciogcmVkaXJlY3QgPSAiIgorICAgICAgICAgICAgICAgICJIVFRQ LzEuMSAzMDIgRm91bmRcclxuIgorICAgICAgICAgICAgICAgICJMb2NhdGlvbjogaHR0cDovL2Rv d25sb2FkL1xyXG4iCisgICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAwXHJcblxyXG4i OworICAgICAgICAgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc3NsLCByZWRpcmVjdCwgc3RybGVu KHJlZGlyZWN0KSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICBjb25zdCBjaGFyKiBjb250ZW50ID0gIiIKKyAgICAgICAgIkhUVFAvMS4x IDIwMCBPS1xyXG4iCisgICAgICAgICJDb250ZW50LUxlbmd0aDogMzRcclxuXHJcbiIKKyAgICAg ICAgIjxzY3JpcHQ+YWxlcnQoJ3N1Y2Nlc3MhJyk8L3NjcmlwdD4iOworICAgICAgICBUQ1BTZXJ2 ZXI6OndyaXRlKHNvY2tldCwgY29udGVudCwgc3RybGVuKGNvbnRlbnQpKTsKKyAgICB9LCAyKTsK KworICAgIGF1dG8gc3RvcmVDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0Tm9uUGVyc2lzdGVudENvbmZpZ3VyYXRpb25d KTsKKyAgICBbc3RvcmVDb25maWd1cmF0aW9uIHNldEhUVFBQcm94eTpbTlNVUkwgVVJMV2l0aFN0 cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImh0dHBzOi8vMTI3LjAuMC4xOiVkLyIs IHNlcnZlci5wb3J0KCldXV07CisgICAgW3N0b3JlQ29uZmlndXJhdGlvbiBzZXRIVFRQU1Byb3h5 OltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cHM6 Ly8xMjcuMC4wLjE6JWQvIiwgc2VydmVyLnBvcnQoKV1dXTsKKyAgICBbc3RvcmVDb25maWd1cmF0 aW9uIHNldEFsbG93c1NlcnZlclByZWNvbm5lY3Q6Tk9dOworICAgIGF1dG8gdmlld0NvbmZpZ3Vy YXRpb24gPSBhZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10pOworICAgIFt2aWV3 Q29uZmlndXJhdGlvbiBzZXRXZWJzaXRlRGF0YVN0b3JlOmFkb3B0TlMoW1tXS1dlYnNpdGVEYXRh U3RvcmUgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246c3RvcmVDb25maWd1cmF0aW9uLmdl dCgpXSkuZ2V0KCldOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAxMDAsIDEwMCkgY29uZmlndXJhdGlv bjp2aWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5T KFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOworICAgIGRlbGVnYXRlLmdldCgpLmRpZFJl Y2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSA9IF4oV0tXZWJWaWV3ICosIE5TVVJMQXV0aGVu dGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShO U1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24sIE5TVVJMQ3JlZGVudGlhbCAqKSkg eworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlVXNl Q3JlZGVudGlhbCwgW05TVVJMQ3JlZGVudGlhbCBjcmVkZW50aWFsRm9yVHJ1c3Q6Y2hhbGxlbmdl LnByb3RlY3Rpb25TcGFjZS5zZXJ2ZXJUcnVzdF0pOworICAgIH07CisgICAgd2ViVmlldy5nZXQo KS5uYXZpZ2F0aW9uRGVsZWdhdGUgPSBkZWxlZ2F0ZS5nZXQoKTsKKyAgICBbd2ViVmlldyBsb2Fk UmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OkAiaHR0cHM6Ly9kb3dubG9hZC8iXV1dOworICAgIEVYUEVDVF9XS19TVFJFUShbd2ViVmlldyBf dGVzdF93YWl0Rm9yQWxlcnRdLCAic3VjY2VzcyEiKTsKK30KKworI2VuZGlmCg==