180216 2017-11-30 13:16:47 -0800 ServiceWorkerThread's m_extendedEvents gets destroyed on the wrong thread 2017-11-30 14:36:32 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson commit-queue webkit-bug-importer oldest_to_newest 1376477 0 cdumez 2017-11-30 13:16:47 -0800 ServiceWorkerThread's m_extendedEvents gets destroyed on the wrong thread. Those events live on the worker thread so we should destroy them on the worker thread, not the main thread. 1376484 1 328015 cdumez 2017-11-30 13:30:07 -0800 Created attachment 328015 Patch 1376497 2 328019 cdumez 2017-11-30 13:56:12 -0800 Created attachment 328019 Patch 1376520 3 328019 commit-queue 2017-11-30 14:35:29 -0800 Comment on attachment 328019 Patch Clearing flags on attachment: 328019 Committed r225351: <https://trac.webkit.org/changeset/225351> 1376521 4 commit-queue 2017-11-30 14:35:30 -0800 All reviewed patches have been landed. Closing bug. 1376523 5 webkit-bug-importer 2017-11-30 14:36:32 -0800 <rdar://problem/35782777> 328015 2017-11-30 13:30:07 -0800 2017-11-30 13:56:11 -0800 Patch bug-180216-20171130133006.patch text/plain 9403 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E5MjgwMjI2OWNlOWU3 Mjk2ZWFlNzBiYmY3NmQwZWRkMmU5MDhjMC4uMWY3ZWQ0MTViOTAwNTRkMTc1MmNkZDMwNjU1MWM4 ZTQyZjFkMWZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTExLTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2VydmljZVdvcmtlclRocmVh ZCdzIG1fZXh0ZW5kZWRFdmVudHMgZ2V0cyBkZXN0cm95ZWQgb24gdGhlIHdyb25nIHRocmVhZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwMjE2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VydmljZVdv cmtlclRocmVhZCdzIG1fZXh0ZW5kZWRFdmVudHMgZ2V0cyBkZXN0cm95ZWQgb24gdGhlIHdyb25n IHRocmVhZC4gVGhvc2UgZXZlbnRzIGxpdmUgb24gdGhlIHdvcmtlcgorICAgICAgICB0aHJlYWQg c28gd2Ugc2hvdWxkIGRlc3Ryb3kgdGhlbSBvbiB0aGUgd29ya2VyIHRocmVhZCwgbm90IHRoZSBt YWluIHRocmVhZC4gVG8gYWRkcmVzcyB0aGUgaXNzdWUsIG1fZXh0ZW5kZWRFdmVudHMKKyAgICAg ICAgd2FzIG1vdmVkIHRvIFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZSwgd2hpY2ggYWN0dWFsbHkg bGl2ZXMgb24gdGhlIHJpZ2h0IHRocmVhZC4KKworICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9T ZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdv cmtlckdsb2JhbFNjb3BlOjp1cGRhdGVFeHRlbmRlZEV2ZW50c1NldCk6CisgICAgICAgICogd29y a2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5oOgorICAgICAgICAqIHdvcmtl cnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VydmljZVdvcmtlclRocmVhZDo6cG9zdEZldGNoVGFzayk6CisgICAgICAgIChXZWJD b3JlOjpTZXJ2aWNlV29ya2VyVGhyZWFkOjpwb3N0TWVzc2FnZVRvU2VydmljZVdvcmtlckdsb2Jh bFNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJUaHJlYWQ6OnVwZGF0ZUV4 dGVuZGVkRXZlbnRzU2V0KTogRGVsZXRlZC4KKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29u dGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29y a2VyVGhyZWFkOjpoYXNQZW5kaW5nRXZlbnRzIGNvbnN0KTogRGVsZXRlZC4KKwogMjAxNy0xMS0z MCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBXb3Jr ZXJUaHJlYWQgbGlmZXRpbWUgbXVjaCBtb3JlIHByZWRpY3RhYmxlLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNjb3Bl LmNwcAppbmRleCAzM2M3ZjJlMWYxZDM5ZDhjMTkwZmEwNmIwNzA4MDc0ZDRiMjcwYWMzLi40Nzc3 YjM5ZjQ1MTk5NWFmNTkyZmJjMjEwNTAwYmEwODdkMzNjMDczIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNjb3BlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNjb3Bl LmNwcApAQCAtMjgsNiArMjgsOCBAQAogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQogCisj aW5jbHVkZSAiRXh0ZW5kYWJsZUV2ZW50LmgiCisjaW5jbHVkZSAiU1dDb250ZXh0TWFuYWdlci5o IgogI2luY2x1ZGUgIlNlcnZpY2VXb3JrZXJDbGllbnQuaCIKICNpbmNsdWRlICJTZXJ2aWNlV29y a2VyQ2xpZW50cy5oIgogI2luY2x1ZGUgIlNlcnZpY2VXb3JrZXJUaHJlYWQuaCIKQEAgLTc3LDYg Kzc5LDM2IEBAIHZvaWQgU2VydmljZVdvcmtlckdsb2JhbFNjb3BlOjpyZW1vdmVTZXJ2aWNlV29y a2VyQ2xpZW50KFNlcnZpY2VXb3JrZXJDbGllbnQmIGNsCiAgICAgQVNTRVJUX1VOVVNFRChpc1Jl bW92ZWQsIGlzUmVtb3ZlZCk7CiB9CiAKKy8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9TZXJ2aWNl V29ya2VyLyN1cGRhdGUtc2VydmljZS13b3JrZXItZXh0ZW5kZWQtZXZlbnRzLXNldC1hbGdvcml0 aG0KK3ZvaWQgU2VydmljZVdvcmtlckdsb2JhbFNjb3BlOjp1cGRhdGVFeHRlbmRlZEV2ZW50c1Nl dChFeHRlbmRhYmxlRXZlbnQqIG5ld0V2ZW50KQoreworICAgIEFTU0VSVCghaXNNYWluVGhyZWFk KCkpOworICAgIEFTU0VSVCghbmV3RXZlbnQgfHwgIW5ld0V2ZW50LT5pc0JlaW5nRGlzcGF0Y2hl ZCgpKTsKKyAgICBib29sIGhhZFBlbmRpbmdFdmVudHMgPSBoYXNQZW5kaW5nRXZlbnRzKCk7Cisg ICAgbV9leHRlbmRlZEV2ZW50cy5yZW1vdmVBbGxNYXRjaGluZyhbXShhdXRvJiBldmVudCkgewor ICAgICAgICByZXR1cm4gIWV2ZW50LT5wZW5kaW5nUHJvbWlzZUNvdW50KCk7CisgICAgfSk7CisK KyAgICBpZiAobmV3RXZlbnQgJiYgbmV3RXZlbnQtPnBlbmRpbmdQcm9taXNlQ291bnQoKSkgewor ICAgICAgICBtX2V4dGVuZGVkRXZlbnRzLmFwcGVuZCgqbmV3RXZlbnQpOworICAgICAgICBuZXdF dmVudC0+d2hlbkFsbEV4dGVuZExpZmV0aW1lUHJvbWlzZXNBcmVTZXR0bGVkKFt0aGlzXShhdXRv JiYpIHsKKyAgICAgICAgICAgIHVwZGF0ZUV4dGVuZGVkRXZlbnRzU2V0KCk7CisgICAgICAgIH0p OworICAgICAgICAvLyBDbGVhciBvdXQgdGhlIGV2ZW50J3MgdGFyZ2V0IGFzIGl0IGlzIHRoZSBX b3JrZXJHbG9iYWxTY29wZSBhbmQgd2UgZG8gbm90IHdhbnQgdG8ga2VlcCBpdAorICAgICAgICAv LyBhbGl2ZSB1bm5lY2Vzc2FyaWx5LgorICAgICAgICBuZXdFdmVudC0+c2V0VGFyZ2V0KG51bGxw dHIpOworICAgIH0KKworICAgIGJvb2wgaGFzUGVuZGluZ0V2ZW50cyA9IHRoaXMtPmhhc1BlbmRp bmdFdmVudHMoKTsKKyAgICBpZiAoaGFzUGVuZGluZ0V2ZW50cyA9PSBoYWRQZW5kaW5nRXZlbnRz KQorICAgICAgICByZXR1cm47CisKKyAgICBjYWxsT25NYWluVGhyZWFkKFt0aHJlYWRJZGVudGlm aWVyID0gdGhyZWFkKCkuaWRlbnRpZmllcigpLCBoYXNQZW5kaW5nRXZlbnRzXSB7CisgICAgICAg IGlmIChhdXRvKiBjb25uZWN0aW9uID0gU1dDb250ZXh0TWFuYWdlcjo6c2luZ2xldG9uKCkuY29u bmVjdGlvbigpKQorICAgICAgICAgICAgY29ubmVjdGlvbi0+c2V0U2VydmljZVdvcmtlckhhc1Bl bmRpbmdFdmVudHModGhyZWFkSWRlbnRpZmllciwgaGFzUGVuZGluZ0V2ZW50cyk7CisgICAgfSk7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShTRVJWSUNF X1dPUktFUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2 aWNlV29ya2VyR2xvYmFsU2NvcGUuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9T ZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuaAppbmRleCA4OTI2MjY0YzNhMGUxZWNkYzM2MDU1NWMy ZjQzZDFkZGE4NTNlOWE3Li5hN2RiMGNjNDNiNWU0YWY3ODI4ZDgyMjU1NDBiZDc5ZWFjNTQ2Mjlh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtl ckdsb2JhbFNjb3BlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZp Y2VXb3JrZXJHbG9iYWxTY29wZS5oCkBAIC0zNSw2ICszNSw3IEBACiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIGNsYXNzIERlZmVycmVkUHJvbWlzZTsKK2NsYXNzIEV4dGVuZGFibGVFdmVudDsKIHN0 cnVjdCBTZXJ2aWNlV29ya2VyQ2xpZW50RGF0YTsKIGNsYXNzIFNlcnZpY2VXb3JrZXJDbGllbnQ7 CiBjbGFzcyBTZXJ2aWNlV29ya2VyQ2xpZW50czsKQEAgLTY0LDEzICs2NSwxOCBAQCBwdWJsaWM6 CiAgICAgdm9pZCBhZGRTZXJ2aWNlV29ya2VyQ2xpZW50KFNlcnZpY2VXb3JrZXJDbGllbnQmKTsK ICAgICB2b2lkIHJlbW92ZVNlcnZpY2VXb3JrZXJDbGllbnQoU2VydmljZVdvcmtlckNsaWVudCYp OwogCisgICAgdm9pZCB1cGRhdGVFeHRlbmRlZEV2ZW50c1NldChFeHRlbmRhYmxlRXZlbnQqIG5l d0V2ZW50ID0gbnVsbHB0cik7CisKIHByaXZhdGU6CiAgICAgU2VydmljZVdvcmtlckdsb2JhbFNj b3BlKGNvbnN0IFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSYsIGNvbnN0IFVSTCYsIGNvbnN0IFN0 cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQsIGJvb2wgaXNPbmxpbmUs IFNlcnZpY2VXb3JrZXJUaHJlYWQmLCBib29sIHNob3VsZEJ5cGFzc01haW5Xb3JsZENvbnRlbnRT ZWN1cml0eVBvbGljeSwgUmVmPFNlY3VyaXR5T3JpZ2luPiYmIHRvcE9yaWdpbiwgTW9ub3Rvbmlj VGltZSB0aW1lT3JpZ2luLCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eSosIFNvY2tldFBy b3ZpZGVyKiwgUEFMOjpTZXNzaW9uSUQpOwogCisgICAgYm9vbCBoYXNQZW5kaW5nRXZlbnRzKCkg Y29uc3QgeyByZXR1cm4gIW1fZXh0ZW5kZWRFdmVudHMuaXNFbXB0eSgpOyB9CisKICAgICBTZXJ2 aWNlV29ya2VyQ29udGV4dERhdGEgbV9jb250ZXh0RGF0YTsKICAgICBSZWY8U2VydmljZVdvcmtl clJlZ2lzdHJhdGlvbj4gbV9yZWdpc3RyYXRpb247CiAgICAgUmVmPFNlcnZpY2VXb3JrZXJDbGll bnRzPiBtX2NsaWVudHM7CiAgICAgSGFzaE1hcDxTZXJ2aWNlV29ya2VyQ2xpZW50SWRlbnRpZmll ciwgU2VydmljZVdvcmtlckNsaWVudCo+IG1fY2xpZW50TWFwOworICAgIFZlY3RvcjxSZWY8RXh0 ZW5kYWJsZUV2ZW50Pj4gbV9leHRlbmRlZEV2ZW50czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0 L1NlcnZpY2VXb3JrZXJUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5jcHAKaW5kZXggMDU5YTk3NGE5YjEyM2EwZDE2 ZDBiY2M3MTYwODBiM2Y0ZGRlMzQwOC4uMWU1MDg4Mzk4YWE1NDEwN2U0MDMwYTIzMjA3ZmFhNzIz MzdkZDkwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRl eHQvU2VydmljZVdvcmtlclRocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5jcHAKQEAgLTk5LDggKzk5LDkgQEAg dm9pZCBTZXJ2aWNlV29ya2VyVGhyZWFkOjpwb3N0RmV0Y2hUYXNrKFJlZjxTZXJ2aWNlV29ya2Vy RmV0Y2g6OkNsaWVudD4mJiBjbGllbnQKICAgICAvLyBGSVhNRTogaW5zdGVhZCBvZiBkaXJlY3Rs eSB1c2luZyBydW5Mb29wKCksIHdlIHNob3VsZCBiZSB1c2luZyBzb21ldGhpbmcgbGlrZSBXb3Jr ZXJHbG9iYWxTY29wZVByb3h5LgogICAgIC8vIEZJWE1FOiByZXF1ZXN0IGFuZCBvcHRpb25zIGNv bWUgc3RyYWlndGggZnJvbSBJUEMgc28gYXJlIGFscmVhZHkgaXNvbGF0ZWQuIFdlIHNob3VsZCBi ZSBhYmxlIHRvIHRha2UgYmVuZWZpdCBvZiB0aGF0LgogICAgIHJ1bkxvb3AoKS5wb3N0VGFza0Zv ck1vZGUoW3RoaXMsIGNsaWVudCA9IFdURk1vdmUoY2xpZW50KSwgY2xpZW50SWQsIHJlcXVlc3Qg PSByZXF1ZXN0Lmlzb2xhdGVkQ29weSgpLCBvcHRpb25zID0gb3B0aW9ucy5pc29sYXRlZENvcHko KV0gKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpIG11dGFibGUgewotICAgICAgICBh dXRvIGZldGNoRXZlbnQgPSBTZXJ2aWNlV29ya2VyRmV0Y2g6OmRpc3BhdGNoRmV0Y2hFdmVudChX VEZNb3ZlKGNsaWVudCksIGRvd25jYXN0PFdvcmtlckdsb2JhbFNjb3BlPihjb250ZXh0KSwgY2xp ZW50SWQsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUob3B0aW9ucykpOwotICAgICAgICB1cGRh dGVFeHRlbmRlZEV2ZW50c1NldChmZXRjaEV2ZW50LnB0cigpKTsKKyAgICAgICAgYXV0byYgc2Vy dmljZVdvcmtlckdsb2JhbFNjb3BlID0gZG93bmNhc3Q8U2VydmljZVdvcmtlckdsb2JhbFNjb3Bl Pihjb250ZXh0KTsKKyAgICAgICAgYXV0byBmZXRjaEV2ZW50ID0gU2VydmljZVdvcmtlckZldGNo OjpkaXNwYXRjaEZldGNoRXZlbnQoV1RGTW92ZShjbGllbnQpLCBzZXJ2aWNlV29ya2VyR2xvYmFs U2NvcGUsIGNsaWVudElkLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKG9wdGlvbnMpKTsKKyAg ICAgICAgc2VydmljZVdvcmtlckdsb2JhbFNjb3BlLnVwZGF0ZUV4dGVuZGVkRXZlbnRzU2V0KGZl dGNoRXZlbnQucHRyKCkpOwogICAgIH0sIFdvcmtlclJ1bkxvb3A6OmRlZmF1bHRNb2RlKCkpOwog fQogCkBAIC0xMTQsNyArMTE1LDcgQEAgdm9pZCBTZXJ2aWNlV29ya2VyVGhyZWFkOjpwb3N0TWVz c2FnZVRvU2VydmljZVdvcmtlckdsb2JhbFNjb3BlKFJlZjxTZXJpYWxpemVkU2MKICAgICAgICAg YXV0byBtZXNzYWdlRXZlbnQgPSBFeHRlbmRhYmxlTWVzc2FnZUV2ZW50OjpjcmVhdGUoV1RGTW92 ZShwb3J0cyksIFdURk1vdmUobWVzc2FnZSksIHNvdXJjZU9yaWdpbi0+dG9TdHJpbmcoKSwgeyB9 LCBFeHRlbmRhYmxlTWVzc2FnZUV2ZW50U291cmNlIHsgc291cmNlIH0pOwogICAgICAgICBzZXJ2 aWNlV29ya2VyR2xvYmFsU2NvcGUuZGlzcGF0Y2hFdmVudChtZXNzYWdlRXZlbnQpOwogICAgICAg ICBzZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUudGhyZWFkKCkud29ya2VyT2JqZWN0UHJveHkoKS5j b25maXJtTWVzc2FnZUZyb21Xb3JrZXJPYmplY3Qoc2VydmljZVdvcmtlckdsb2JhbFNjb3BlLmhh c1BlbmRpbmdBY3Rpdml0eSgpKTsKLSAgICAgICAgdXBkYXRlRXh0ZW5kZWRFdmVudHNTZXQobWVz c2FnZUV2ZW50LnB0cigpKTsKKyAgICAgICAgc2VydmljZVdvcmtlckdsb2JhbFNjb3BlLnVwZGF0 ZUV4dGVuZGVkRXZlbnRzU2V0KG1lc3NhZ2VFdmVudC5wdHIoKSk7CiAgICAgfSk7CiAgICAgcnVu TG9vcCgpLnBvc3RUYXNrKFdURk1vdmUodGFzaykpOwogfQpAQCAtMTY0LDM2ICsxNjUsNiBAQCB2 b2lkIFNlcnZpY2VXb3JrZXJUaHJlYWQ6OmZpcmVBY3RpdmF0ZUV2ZW50KCkKICAgICBydW5Mb29w KCkucG9zdFRhc2soV1RGTW92ZSh0YXNrKSk7CiB9CiAKLS8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5p by9TZXJ2aWNlV29ya2VyLyN1cGRhdGUtc2VydmljZS13b3JrZXItZXh0ZW5kZWQtZXZlbnRzLXNl dC1hbGdvcml0aG0KLXZvaWQgU2VydmljZVdvcmtlclRocmVhZDo6dXBkYXRlRXh0ZW5kZWRFdmVu dHNTZXQoRXh0ZW5kYWJsZUV2ZW50KiBuZXdFdmVudCkKLXsKLSAgICBBU1NFUlQoIWlzTWFpblRo cmVhZCgpKTsKLSAgICBBU1NFUlQoIW5ld0V2ZW50IHx8ICFuZXdFdmVudC0+aXNCZWluZ0Rpc3Bh dGNoZWQoKSk7Ci0gICAgYm9vbCBoYWRQZW5kaW5nRXZlbnRzID0gaGFzUGVuZGluZ0V2ZW50cygp OwotICAgIG1fZXh0ZW5kZWRFdmVudHMucmVtb3ZlQWxsTWF0Y2hpbmcoW10oYXV0byYgZXZlbnQp IHsKLSAgICAgICAgcmV0dXJuICFldmVudC0+cGVuZGluZ1Byb21pc2VDb3VudCgpOwotICAgIH0p OwotCi0gICAgaWYgKG5ld0V2ZW50ICYmIG5ld0V2ZW50LT5wZW5kaW5nUHJvbWlzZUNvdW50KCkp IHsKLSAgICAgICAgbV9leHRlbmRlZEV2ZW50cy5hcHBlbmQoKm5ld0V2ZW50KTsKLSAgICAgICAg bmV3RXZlbnQtPndoZW5BbGxFeHRlbmRMaWZldGltZVByb21pc2VzQXJlU2V0dGxlZChbdGhpc10o YXV0byYmKSB7Ci0gICAgICAgICAgICB1cGRhdGVFeHRlbmRlZEV2ZW50c1NldCgpOwotICAgICAg ICB9KTsKLSAgICAgICAgLy8gQ2xlYXIgb3V0IHRoZSBldmVudCdzIHRhcmdldCBhcyBpdCBpcyB0 aGUgV29ya2VyR2xvYmFsU2NvcGUgYW5kIHdlIGRvIG5vdCB3YW50IHRvIGtlZXAgaXQKLSAgICAg ICAgLy8gYWxpdmUgdW5uZWNlc3NhcmlseS4KLSAgICAgICAgbmV3RXZlbnQtPnNldFRhcmdldChu dWxscHRyKTsKLSAgICB9Ci0KLSAgICBib29sIGhhc1BlbmRpbmdFdmVudHMgPSB0aGlzLT5oYXNQ ZW5kaW5nRXZlbnRzKCk7Ci0gICAgaWYgKGhhc1BlbmRpbmdFdmVudHMgPT0gaGFkUGVuZGluZ0V2 ZW50cykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgY2FsbE9uTWFpblRocmVhZChbaWRlbnRpZmll ciA9IHRoaXMtPmlkZW50aWZpZXIoKSwgaGFzUGVuZGluZ0V2ZW50c10gewotICAgICAgICBpZiAo YXV0byogY29ubmVjdGlvbiA9IFNXQ29udGV4dE1hbmFnZXI6OnNpbmdsZXRvbigpLmNvbm5lY3Rp b24oKSkKLSAgICAgICAgICAgIGNvbm5lY3Rpb24tPnNldFNlcnZpY2VXb3JrZXJIYXNQZW5kaW5n RXZlbnRzKGlkZW50aWZpZXIsIGhhc1BlbmRpbmdFdmVudHMpOwotICAgIH0pOwotfQotCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNl V29ya2VyVGhyZWFkLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9T ZXJ2aWNlV29ya2VyVGhyZWFkLmgKaW5kZXggMTFlNzNhNWNhY2M0ZjhhODBmNDFmOTg4ODZjYjA5 ZGY3YmY0YzEwOS4uZWE1MWRlN2ZlOGVjOGEwYzBlMGMzY2EwYzU3MWY5NmJmZWIxYTlmYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdv cmtlclRocmVhZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0 L1NlcnZpY2VXb3JrZXJUaHJlYWQuaApAQCAtNzQsMTIgKzc0LDggQEAgcHJvdGVjdGVkOgogcHJp dmF0ZToKICAgICBXRUJDT1JFX0VYUE9SVCBTZXJ2aWNlV29ya2VyVGhyZWFkKGNvbnN0IFNlcnZp Y2VXb3JrZXJDb250ZXh0RGF0YSYsIFBBTDo6U2Vzc2lvbklELCBXb3JrZXJMb2FkZXJQcm94eSYs IFdvcmtlckRlYnVnZ2VyUHJveHkmKTsKIAotICAgIHZvaWQgdXBkYXRlRXh0ZW5kZWRFdmVudHNT ZXQoRXh0ZW5kYWJsZUV2ZW50KiBuZXdFdmVudCA9IG51bGxwdHIpOwotICAgIGJvb2wgaGFzUGVu ZGluZ0V2ZW50cygpIGNvbnN0IHsgcmV0dXJuICFtX2V4dGVuZGVkRXZlbnRzLmlzRW1wdHkoKTsg fQotCiAgICAgU2VydmljZVdvcmtlckNvbnRleHREYXRhIG1fZGF0YTsKICAgICBXb3JrZXJPYmpl Y3RQcm94eSYgbV93b3JrZXJPYmplY3RQcm94eTsKLSAgICBWZWN0b3I8UmVmPEV4dGVuZGFibGVF dmVudD4+IG1fZXh0ZW5kZWRFdmVudHM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 328019 2017-11-30 13:56:12 -0800 2017-11-30 14:35:29 -0800 Patch bug-180216-20171130135612.patch text/plain 9945 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E5MjgwMjI2OWNlOWU3 Mjk2ZWFlNzBiYmY3NmQwZWRkMmU5MDhjMC4uMWY3ZWQ0MTViOTAwNTRkMTc1MmNkZDMwNjU1MWM4 ZTQyZjFkMWZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTExLTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2VydmljZVdvcmtlclRocmVh ZCdzIG1fZXh0ZW5kZWRFdmVudHMgZ2V0cyBkZXN0cm95ZWQgb24gdGhlIHdyb25nIHRocmVhZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwMjE2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VydmljZVdv cmtlclRocmVhZCdzIG1fZXh0ZW5kZWRFdmVudHMgZ2V0cyBkZXN0cm95ZWQgb24gdGhlIHdyb25n IHRocmVhZC4gVGhvc2UgZXZlbnRzIGxpdmUgb24gdGhlIHdvcmtlcgorICAgICAgICB0aHJlYWQg c28gd2Ugc2hvdWxkIGRlc3Ryb3kgdGhlbSBvbiB0aGUgd29ya2VyIHRocmVhZCwgbm90IHRoZSBt YWluIHRocmVhZC4gVG8gYWRkcmVzcyB0aGUgaXNzdWUsIG1fZXh0ZW5kZWRFdmVudHMKKyAgICAg ICAgd2FzIG1vdmVkIHRvIFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZSwgd2hpY2ggYWN0dWFsbHkg bGl2ZXMgb24gdGhlIHJpZ2h0IHRocmVhZC4KKworICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9T ZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdv cmtlckdsb2JhbFNjb3BlOjp1cGRhdGVFeHRlbmRlZEV2ZW50c1NldCk6CisgICAgICAgICogd29y a2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5oOgorICAgICAgICAqIHdvcmtl cnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VydmljZVdvcmtlclRocmVhZDo6cG9zdEZldGNoVGFzayk6CisgICAgICAgIChXZWJD b3JlOjpTZXJ2aWNlV29ya2VyVGhyZWFkOjpwb3N0TWVzc2FnZVRvU2VydmljZVdvcmtlckdsb2Jh bFNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJUaHJlYWQ6OnVwZGF0ZUV4 dGVuZGVkRXZlbnRzU2V0KTogRGVsZXRlZC4KKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29u dGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29y a2VyVGhyZWFkOjpoYXNQZW5kaW5nRXZlbnRzIGNvbnN0KTogRGVsZXRlZC4KKwogMjAxNy0xMS0z MCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBXb3Jr ZXJUaHJlYWQgbGlmZXRpbWUgbXVjaCBtb3JlIHByZWRpY3RhYmxlLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HdWFyZGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NR3VhcmRlZE9iamVjdC5jcHAKaW5kZXggZWQ4ZGJkMTFi NzU3YjMyMDI2YmI0MDk5YjAyZTViMTM0ZTQ0NWQwYi4uYTgzNTkwMzM4MWE1ZmUwZDFlNjlkMDU4 NzQ5YzZiMTBhYTVkNjhiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNET01HdWFyZGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RPTUd1YXJkZWRPYmplY3QuY3BwCkBAIC01Myw2ICs1Myw3IEBAIHZvaWQgRE9NR3VhcmRlZE9i amVjdDo6Y2xlYXIoKQogICAgICAgICBtX2dsb2JhbE9iamVjdC0+Z3VhcmRlZE9iamVjdHMobG9j a2VyKS5yZW1vdmUodGhpcyk7CiAgICAgfQogICAgIG1fZ3VhcmRlZC5jbGVhcigpOworICAgIG1f Z2xvYmFsT2JqZWN0LmNsZWFyKCk7CiB9CiAKIHZvaWQgRE9NR3VhcmRlZE9iamVjdDo6Y29udGV4 dERlc3Ryb3llZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uv U2VydmljZVdvcmtlckdsb2JhbFNjb3BlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vy dmljZS9TZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuY3BwCmluZGV4IDMzYzdmMmUxZjFkMzlkOGMx OTBmYTA2YjA3MDgwNzRkNGIyNzBhYzMuLjQ3NzdiMzlmNDUxOTk1YWY1OTJmYmMyMTA1MDBiYTA4 N2QzM2MwNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2 aWNlV29ya2VyR2xvYmFsU2NvcGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vy dmljZS9TZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuY3BwCkBAIC0yOCw2ICsyOCw4IEBACiAKICNp ZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCiAKKyNpbmNsdWRlICJFeHRlbmRhYmxlRXZlbnQuaCIK KyNpbmNsdWRlICJTV0NvbnRleHRNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiU2VydmljZVdvcmtlckNs aWVudC5oIgogI2luY2x1ZGUgIlNlcnZpY2VXb3JrZXJDbGllbnRzLmgiCiAjaW5jbHVkZSAiU2Vy dmljZVdvcmtlclRocmVhZC5oIgpAQCAtNzcsNiArNzksMzYgQEAgdm9pZCBTZXJ2aWNlV29ya2Vy R2xvYmFsU2NvcGU6OnJlbW92ZVNlcnZpY2VXb3JrZXJDbGllbnQoU2VydmljZVdvcmtlckNsaWVu dCYgY2wKICAgICBBU1NFUlRfVU5VU0VEKGlzUmVtb3ZlZCwgaXNSZW1vdmVkKTsKIH0KIAorLy8g aHR0cHM6Ly93M2MuZ2l0aHViLmlvL1NlcnZpY2VXb3JrZXIvI3VwZGF0ZS1zZXJ2aWNlLXdvcmtl ci1leHRlbmRlZC1ldmVudHMtc2V0LWFsZ29yaXRobQordm9pZCBTZXJ2aWNlV29ya2VyR2xvYmFs U2NvcGU6OnVwZGF0ZUV4dGVuZGVkRXZlbnRzU2V0KEV4dGVuZGFibGVFdmVudCogbmV3RXZlbnQp Cit7CisgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKCFuZXdFdmVudCB8 fCAhbmV3RXZlbnQtPmlzQmVpbmdEaXNwYXRjaGVkKCkpOworICAgIGJvb2wgaGFkUGVuZGluZ0V2 ZW50cyA9IGhhc1BlbmRpbmdFdmVudHMoKTsKKyAgICBtX2V4dGVuZGVkRXZlbnRzLnJlbW92ZUFs bE1hdGNoaW5nKFtdKGF1dG8mIGV2ZW50KSB7CisgICAgICAgIHJldHVybiAhZXZlbnQtPnBlbmRp bmdQcm9taXNlQ291bnQoKTsKKyAgICB9KTsKKworICAgIGlmIChuZXdFdmVudCAmJiBuZXdFdmVu dC0+cGVuZGluZ1Byb21pc2VDb3VudCgpKSB7CisgICAgICAgIG1fZXh0ZW5kZWRFdmVudHMuYXBw ZW5kKCpuZXdFdmVudCk7CisgICAgICAgIG5ld0V2ZW50LT53aGVuQWxsRXh0ZW5kTGlmZXRpbWVQ cm9taXNlc0FyZVNldHRsZWQoW3RoaXNdKGF1dG8mJikgeworICAgICAgICAgICAgdXBkYXRlRXh0 ZW5kZWRFdmVudHNTZXQoKTsKKyAgICAgICAgfSk7CisgICAgICAgIC8vIENsZWFyIG91dCB0aGUg ZXZlbnQncyB0YXJnZXQgYXMgaXQgaXMgdGhlIFdvcmtlckdsb2JhbFNjb3BlIGFuZCB3ZSBkbyBu b3Qgd2FudCB0byBrZWVwIGl0CisgICAgICAgIC8vIGFsaXZlIHVubmVjZXNzYXJpbHkuCisgICAg ICAgIG5ld0V2ZW50LT5zZXRUYXJnZXQobnVsbHB0cik7CisgICAgfQorCisgICAgYm9vbCBoYXNQ ZW5kaW5nRXZlbnRzID0gdGhpcy0+aGFzUGVuZGluZ0V2ZW50cygpOworICAgIGlmIChoYXNQZW5k aW5nRXZlbnRzID09IGhhZFBlbmRpbmdFdmVudHMpCisgICAgICAgIHJldHVybjsKKworICAgIGNh bGxPbk1haW5UaHJlYWQoW3RocmVhZElkZW50aWZpZXIgPSB0aHJlYWQoKS5pZGVudGlmaWVyKCks IGhhc1BlbmRpbmdFdmVudHNdIHsKKyAgICAgICAgaWYgKGF1dG8qIGNvbm5lY3Rpb24gPSBTV0Nv bnRleHRNYW5hZ2VyOjpzaW5nbGV0b24oKS5jb25uZWN0aW9uKCkpCisgICAgICAgICAgICBjb25u ZWN0aW9uLT5zZXRTZXJ2aWNlV29ya2VySGFzUGVuZGluZ0V2ZW50cyh0aHJlYWRJZGVudGlmaWVy LCBoYXNQZW5kaW5nRXZlbnRzKTsKKyAgICB9KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQogCiAjZW5kaWYgLy8gRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5oIGIvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5oCmlu ZGV4IDg5MjYyNjRjM2EwZTFlY2RjMzYwNTU1YzJmNDNkMWRkYTg1M2U5YTcuLmE3ZGIwY2M0M2I1 ZTRhZjc4MjhkODIyNTU0MGJkNzllYWM1NDYyOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNjb3BlLmgKQEAgLTM1 LDYgKzM1LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRGVmZXJyZWRQcm9taXNl OworY2xhc3MgRXh0ZW5kYWJsZUV2ZW50Owogc3RydWN0IFNlcnZpY2VXb3JrZXJDbGllbnREYXRh OwogY2xhc3MgU2VydmljZVdvcmtlckNsaWVudDsKIGNsYXNzIFNlcnZpY2VXb3JrZXJDbGllbnRz OwpAQCAtNjQsMTMgKzY1LDE4IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZFNlcnZpY2VXb3JrZXJD bGllbnQoU2VydmljZVdvcmtlckNsaWVudCYpOwogICAgIHZvaWQgcmVtb3ZlU2VydmljZVdvcmtl ckNsaWVudChTZXJ2aWNlV29ya2VyQ2xpZW50Jik7CiAKKyAgICB2b2lkIHVwZGF0ZUV4dGVuZGVk RXZlbnRzU2V0KEV4dGVuZGFibGVFdmVudCogbmV3RXZlbnQgPSBudWxscHRyKTsKKwogcHJpdmF0 ZToKICAgICBTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUoY29uc3QgU2VydmljZVdvcmtlckNvbnRl eHREYXRhJiwgY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJp bmcmIHVzZXJBZ2VudCwgYm9vbCBpc09ubGluZSwgU2VydmljZVdvcmtlclRocmVhZCYsIGJvb2wg c2hvdWxkQnlwYXNzTWFpbldvcmxkQ29udGVudFNlY3VyaXR5UG9saWN5LCBSZWY8U2VjdXJpdHlP cmlnaW4+JiYgdG9wT3JpZ2luLCBNb25vdG9uaWNUaW1lIHRpbWVPcmlnaW4sIElEQkNsaWVudDo6 SURCQ29ubmVjdGlvblByb3h5KiwgU29ja2V0UHJvdmlkZXIqLCBQQUw6OlNlc3Npb25JRCk7CiAK KyAgICBib29sIGhhc1BlbmRpbmdFdmVudHMoKSBjb25zdCB7IHJldHVybiAhbV9leHRlbmRlZEV2 ZW50cy5pc0VtcHR5KCk7IH0KKwogICAgIFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSBtX2NvbnRl eHREYXRhOwogICAgIFJlZjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uPiBtX3JlZ2lzdHJhdGlv bjsKICAgICBSZWY8U2VydmljZVdvcmtlckNsaWVudHM+IG1fY2xpZW50czsKICAgICBIYXNoTWFw PFNlcnZpY2VXb3JrZXJDbGllbnRJZGVudGlmaWVyLCBTZXJ2aWNlV29ya2VyQ2xpZW50Kj4gbV9j bGllbnRNYXA7CisgICAgVmVjdG9yPFJlZjxFeHRlbmRhYmxlRXZlbnQ+PiBtX2V4dGVuZGVkRXZl bnRzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5jcHAgYi9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFk LmNwcAppbmRleCAwNTlhOTc0YTliMTIzYTBkMTZkMGJjYzcxNjA4MGIzZjRkZGUzNDA4Li4xZTUw ODgzOThhYTU0MTA3ZTQwMzBhMjMyMDdmYWE3MjMzN2RkOTA3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2Vy VGhyZWFkLmNwcApAQCAtOTksOCArOTksOSBAQCB2b2lkIFNlcnZpY2VXb3JrZXJUaHJlYWQ6OnBv c3RGZXRjaFRhc2soUmVmPFNlcnZpY2VXb3JrZXJGZXRjaDo6Q2xpZW50PiYmIGNsaWVudAogICAg IC8vIEZJWE1FOiBpbnN0ZWFkIG9mIGRpcmVjdGx5IHVzaW5nIHJ1bkxvb3AoKSwgd2Ugc2hvdWxk IGJlIHVzaW5nIHNvbWV0aGluZyBsaWtlIFdvcmtlckdsb2JhbFNjb3BlUHJveHkuCiAgICAgLy8g RklYTUU6IHJlcXVlc3QgYW5kIG9wdGlvbnMgY29tZSBzdHJhaWd0aCBmcm9tIElQQyBzbyBhcmUg YWxyZWFkeSBpc29sYXRlZC4gV2Ugc2hvdWxkIGJlIGFibGUgdG8gdGFrZSBiZW5lZml0IG9mIHRo YXQuCiAgICAgcnVuTG9vcCgpLnBvc3RUYXNrRm9yTW9kZShbdGhpcywgY2xpZW50ID0gV1RGTW92 ZShjbGllbnQpLCBjbGllbnRJZCwgcmVxdWVzdCA9IHJlcXVlc3QuaXNvbGF0ZWRDb3B5KCksIG9w dGlvbnMgPSBvcHRpb25zLmlzb2xhdGVkQ29weSgpXSAoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYg Y29udGV4dCkgbXV0YWJsZSB7Ci0gICAgICAgIGF1dG8gZmV0Y2hFdmVudCA9IFNlcnZpY2VXb3Jr ZXJGZXRjaDo6ZGlzcGF0Y2hGZXRjaEV2ZW50KFdURk1vdmUoY2xpZW50KSwgZG93bmNhc3Q8V29y a2VyR2xvYmFsU2NvcGU+KGNvbnRleHQpLCBjbGllbnRJZCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RG TW92ZShvcHRpb25zKSk7Ci0gICAgICAgIHVwZGF0ZUV4dGVuZGVkRXZlbnRzU2V0KGZldGNoRXZl bnQucHRyKCkpOworICAgICAgICBhdXRvJiBzZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUgPSBkb3du Y2FzdDxTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGU+KGNvbnRleHQpOworICAgICAgICBhdXRvIGZl dGNoRXZlbnQgPSBTZXJ2aWNlV29ya2VyRmV0Y2g6OmRpc3BhdGNoRmV0Y2hFdmVudChXVEZNb3Zl KGNsaWVudCksIHNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZSwgY2xpZW50SWQsIFdURk1vdmUocmVx dWVzdCksIFdURk1vdmUob3B0aW9ucykpOworICAgICAgICBzZXJ2aWNlV29ya2VyR2xvYmFsU2Nv cGUudXBkYXRlRXh0ZW5kZWRFdmVudHNTZXQoZmV0Y2hFdmVudC5wdHIoKSk7CiAgICAgfSwgV29y a2VyUnVuTG9vcDo6ZGVmYXVsdE1vZGUoKSk7CiB9CiAKQEAgLTExNCw3ICsxMTUsNyBAQCB2b2lk IFNlcnZpY2VXb3JrZXJUaHJlYWQ6OnBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyR2xvYmFsU2Nv cGUoUmVmPFNlcmlhbGl6ZWRTYwogICAgICAgICBhdXRvIG1lc3NhZ2VFdmVudCA9IEV4dGVuZGFi bGVNZXNzYWdlRXZlbnQ6OmNyZWF0ZShXVEZNb3ZlKHBvcnRzKSwgV1RGTW92ZShtZXNzYWdlKSwg c291cmNlT3JpZ2luLT50b1N0cmluZygpLCB7IH0sIEV4dGVuZGFibGVNZXNzYWdlRXZlbnRTb3Vy Y2UgeyBzb3VyY2UgfSk7CiAgICAgICAgIHNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5kaXNwYXRj aEV2ZW50KG1lc3NhZ2VFdmVudCk7CiAgICAgICAgIHNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS50 aHJlYWQoKS53b3JrZXJPYmplY3RQcm94eSgpLmNvbmZpcm1NZXNzYWdlRnJvbVdvcmtlck9iamVj dChzZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuaGFzUGVuZGluZ0FjdGl2aXR5KCkpOwotICAgICAg ICB1cGRhdGVFeHRlbmRlZEV2ZW50c1NldChtZXNzYWdlRXZlbnQucHRyKCkpOworICAgICAgICBz ZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUudXBkYXRlRXh0ZW5kZWRFdmVudHNTZXQobWVzc2FnZUV2 ZW50LnB0cigpKTsKICAgICB9KTsKICAgICBydW5Mb29wKCkucG9zdFRhc2soV1RGTW92ZSh0YXNr KSk7CiB9CkBAIC0xNjQsMzYgKzE2NSw2IEBAIHZvaWQgU2VydmljZVdvcmtlclRocmVhZDo6Zmly ZUFjdGl2YXRlRXZlbnQoKQogICAgIHJ1bkxvb3AoKS5wb3N0VGFzayhXVEZNb3ZlKHRhc2spKTsK IH0KIAotLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL1NlcnZpY2VXb3JrZXIvI3VwZGF0ZS1zZXJ2 aWNlLXdvcmtlci1leHRlbmRlZC1ldmVudHMtc2V0LWFsZ29yaXRobQotdm9pZCBTZXJ2aWNlV29y a2VyVGhyZWFkOjp1cGRhdGVFeHRlbmRlZEV2ZW50c1NldChFeHRlbmRhYmxlRXZlbnQqIG5ld0V2 ZW50KQotewotICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwotICAgIEFTU0VSVCghbmV3RXZl bnQgfHwgIW5ld0V2ZW50LT5pc0JlaW5nRGlzcGF0Y2hlZCgpKTsKLSAgICBib29sIGhhZFBlbmRp bmdFdmVudHMgPSBoYXNQZW5kaW5nRXZlbnRzKCk7Ci0gICAgbV9leHRlbmRlZEV2ZW50cy5yZW1v dmVBbGxNYXRjaGluZyhbXShhdXRvJiBldmVudCkgewotICAgICAgICByZXR1cm4gIWV2ZW50LT5w ZW5kaW5nUHJvbWlzZUNvdW50KCk7Ci0gICAgfSk7Ci0KLSAgICBpZiAobmV3RXZlbnQgJiYgbmV3 RXZlbnQtPnBlbmRpbmdQcm9taXNlQ291bnQoKSkgewotICAgICAgICBtX2V4dGVuZGVkRXZlbnRz LmFwcGVuZCgqbmV3RXZlbnQpOwotICAgICAgICBuZXdFdmVudC0+d2hlbkFsbEV4dGVuZExpZmV0 aW1lUHJvbWlzZXNBcmVTZXR0bGVkKFt0aGlzXShhdXRvJiYpIHsKLSAgICAgICAgICAgIHVwZGF0 ZUV4dGVuZGVkRXZlbnRzU2V0KCk7Ci0gICAgICAgIH0pOwotICAgICAgICAvLyBDbGVhciBvdXQg dGhlIGV2ZW50J3MgdGFyZ2V0IGFzIGl0IGlzIHRoZSBXb3JrZXJHbG9iYWxTY29wZSBhbmQgd2Ug ZG8gbm90IHdhbnQgdG8ga2VlcCBpdAotICAgICAgICAvLyBhbGl2ZSB1bm5lY2Vzc2FyaWx5Lgot ICAgICAgICBuZXdFdmVudC0+c2V0VGFyZ2V0KG51bGxwdHIpOwotICAgIH0KLQotICAgIGJvb2wg aGFzUGVuZGluZ0V2ZW50cyA9IHRoaXMtPmhhc1BlbmRpbmdFdmVudHMoKTsKLSAgICBpZiAoaGFz UGVuZGluZ0V2ZW50cyA9PSBoYWRQZW5kaW5nRXZlbnRzKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBjYWxsT25NYWluVGhyZWFkKFtpZGVudGlmaWVyID0gdGhpcy0+aWRlbnRpZmllcigpLCBoYXNQ ZW5kaW5nRXZlbnRzXSB7Ci0gICAgICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gU1dDb250ZXh0 TWFuYWdlcjo6c2luZ2xldG9uKCkuY29ubmVjdGlvbigpKQotICAgICAgICAgICAgY29ubmVjdGlv bi0+c2V0U2VydmljZVdvcmtlckhhc1BlbmRpbmdFdmVudHMoaWRlbnRpZmllciwgaGFzUGVuZGlu Z0V2ZW50cyk7Ci0gICAgfSk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlm IC8vIEVOQUJMRShTRVJWSUNFX1dPUktFUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuaCBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuaAppbmRleCAx MWU3M2E1Y2FjYzRmOGE4MGY0MWY5ODg4NmNiMDlkZjdiZjRjMTA5Li5lYTUxZGU3ZmU4ZWM4YTBj MGUwYzNjYTBjNTcxZjk2YmZlYjFhOWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkLmgKKysrIGIvU291cmNlL1dl YkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5oCkBAIC03 NCwxMiArNzQsOCBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRlOgogICAgIFdFQkNPUkVfRVhQT1JUIFNl cnZpY2VXb3JrZXJUaHJlYWQoY29uc3QgU2VydmljZVdvcmtlckNvbnRleHREYXRhJiwgUEFMOjpT ZXNzaW9uSUQsIFdvcmtlckxvYWRlclByb3h5JiwgV29ya2VyRGVidWdnZXJQcm94eSYpOwogCi0g ICAgdm9pZCB1cGRhdGVFeHRlbmRlZEV2ZW50c1NldChFeHRlbmRhYmxlRXZlbnQqIG5ld0V2ZW50 ID0gbnVsbHB0cik7Ci0gICAgYm9vbCBoYXNQZW5kaW5nRXZlbnRzKCkgY29uc3QgeyByZXR1cm4g IW1fZXh0ZW5kZWRFdmVudHMuaXNFbXB0eSgpOyB9Ci0KICAgICBTZXJ2aWNlV29ya2VyQ29udGV4 dERhdGEgbV9kYXRhOwogICAgIFdvcmtlck9iamVjdFByb3h5JiBtX3dvcmtlck9iamVjdFByb3h5 OwotICAgIFZlY3RvcjxSZWY8RXh0ZW5kYWJsZUV2ZW50Pj4gbV9leHRlbmRlZEV2ZW50czsKIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK