200229 2019-07-29 09:26:49 -0700 Remove unnecessary null check under WebResourceLoadStatisticsStore::hasStorageAccess() 2019-07-29 13:16:21 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen bfulgham commit-queue ggaren rniwa webkit-bug-importer wilander youennf oldest_to_newest 1556583 0 cdumez 2019-07-29 09:26:49 -0700 Remove unnecessary null check under WebResourceLoadStatisticsStore::hasStorageAccess(). 1556587 1 375077 cdumez 2019-07-29 09:27:58 -0700 Created attachment 375077 Patch 1556588 2 375078 cdumez 2019-07-29 09:34:08 -0700 Created attachment 375078 Patch 1556590 3 375079 cdumez 2019-07-29 09:40:50 -0700 Created attachment 375079 Patch 1556673 4 375079 commit-queue 2019-07-29 13:15:50 -0700 Comment on attachment 375079 Patch Clearing flags on attachment: 375079 Committed r247918: <https://trac.webkit.org/changeset/247918> 1556674 5 commit-queue 2019-07-29 13:15:51 -0700 All reviewed patches have been landed. Closing bug. 1556675 6 webkit-bug-importer 2019-07-29 13:16:21 -0700 <rdar://problem/53675626> 375077 2019-07-29 09:27:58 -0700 2019-07-29 09:34:07 -0700 Patch bug-200229-20190729092757.patch text/plain 2299 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3OTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyZmY3Yjg5YzJkYmIxZjUw MWQ0MDc3OTViMjJhODNiNzg0ODNkODIuLmZjMjJmZTY5ZjhmM2U5ZTI0YTYzZGJhYjk3M2EzNjYx Nzg3ZjQwOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDctMjkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgbnVs bCBjaGVjayB1bmRlciBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0b3JhZ2VB Y2Nlc3MoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAwMjI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIHVubmVjZXNzYXJ5IG51bGwgY2hlY2sgdW5kZXIgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpoYXNTdG9yYWdlQWNjZXNzKCkuCisgICAgICAgIFRoZXJlIGlzIGFscmVhZHkg YSBudWxsIGNoZWNrIHdpdGggYW4gZWFybHkgcmV0dXJuIGEgZmV3IGxpbmVzIGFib3ZlLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6Omhhc1N0b3JhZ2VBY2Nlc3MpOgorCiAyMDE5LTA3LTI3ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgbW9yZSBzeXNjYWxscyBpbiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzJyBzYW5kYm94IHByb2ZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggMzRlNDRlODVhZTBiNmI0ZDNhNTRmMDAw NmFiYjA5YWZmMThlYzJiYi4uNzMyMmQwMTQyMTM5M2JkNTYxNDIwNGJlYTc2NDFkMTExZmY1Zjhl ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK QEAgLTI5NiwxMyArMjk2LDExIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpoYXNTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiBzCiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobV9zdGF0aXN0aWNzU3RvcmUpIHsK LSAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlLT5oYXNTdG9yYWdlQWNjZXNzKHN1YkZyYW1l RG9tYWluLCB0b3BGcmFtZURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBbY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oYm9vbCBoYXNTdG9yYWdlQWNjZXNzKSBt dXRhYmxlIHsKLSAgICAgICAgICAgICAgICBwb3N0VGFza1JlcGx5KFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBoYXNTdG9yYWdlQWNjZXNzXSgpIG11dGFi bGUgewotICAgICAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihoYXNTdG9yYWdlQWNj ZXNzKTsKLSAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmhh c1N0b3JhZ2VBY2Nlc3Moc3ViRnJhbWVEb21haW4sIHRvcEZyYW1lRG9tYWluLCBmcmFtZUlELCBw YWdlSUQsIFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShi b29sIGhhc1N0b3JhZ2VBY2Nlc3MpIG11dGFibGUgeworICAgICAgICAgICAgcG9zdFRhc2tSZXBs eShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgaGFzU3Rv cmFnZUFjY2Vzc10oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihoYXNTdG9yYWdlQWNjZXNzKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICB9CisgICAgICAg IH0pOwogICAgIH0pOwogfQogCg== 375078 2019-07-29 09:34:08 -0700 2019-07-29 09:40:49 -0700 Patch bug-200229-20190729093408.patch text/plain 3436 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3OTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyZmY3Yjg5YzJkYmIxZjUw MWQ0MDc3OTViMjJhODNiNzg0ODNkODIuLmZjMjJmZTY5ZjhmM2U5ZTI0YTYzZGJhYjk3M2EzNjYx Nzg3ZjQwOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDctMjkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgbnVs bCBjaGVjayB1bmRlciBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0b3JhZ2VB Y2Nlc3MoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAwMjI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIHVubmVjZXNzYXJ5IG51bGwgY2hlY2sgdW5kZXIgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpoYXNTdG9yYWdlQWNjZXNzKCkuCisgICAgICAgIFRoZXJlIGlzIGFscmVhZHkg YSBudWxsIGNoZWNrIHdpdGggYW4gZWFybHkgcmV0dXJuIGEgZmV3IGxpbmVzIGFib3ZlLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6Omhhc1N0b3JhZ2VBY2Nlc3MpOgorCiAyMDE5LTA3LTI3ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgbW9yZSBzeXNjYWxscyBpbiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzJyBzYW5kYm94IHByb2ZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggMzRlNDRlODVhZTBiNmI0ZDNhNTRmMDAw NmFiYjA5YWZmMThlYzJiYi4uNmJlYjlmMjhlNWRiYzQ0Mzk5Nzk0NzhiZmMxN2E5OGNjNjU3ZWZl YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK QEAgLTI5NiwxMyArMjk2LDExIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpoYXNTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiBzCiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobV9zdGF0aXN0aWNzU3RvcmUpIHsK LSAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlLT5oYXNTdG9yYWdlQWNjZXNzKHN1YkZyYW1l RG9tYWluLCB0b3BGcmFtZURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBbY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oYm9vbCBoYXNTdG9yYWdlQWNjZXNzKSBt dXRhYmxlIHsKLSAgICAgICAgICAgICAgICBwb3N0VGFza1JlcGx5KFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBoYXNTdG9yYWdlQWNjZXNzXSgpIG11dGFi bGUgewotICAgICAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihoYXNTdG9yYWdlQWNj ZXNzKTsKLSAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmhh c1N0b3JhZ2VBY2Nlc3Moc3ViRnJhbWVEb21haW4sIHRvcEZyYW1lRG9tYWluLCBmcmFtZUlELCBw YWdlSUQsIFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShi b29sIGhhc1N0b3JhZ2VBY2Nlc3MpIG11dGFibGUgeworICAgICAgICAgICAgcG9zdFRhc2tSZXBs eShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgaGFzU3Rv cmFnZUFjY2Vzc10oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihoYXNTdG9yYWdlQWNjZXNzKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICB9CisgICAgICAg IH0pOwogICAgIH0pOwogfQogCkBAIC00MDEsMTMgKzM5OSwxMSBAQCB2b2lkIFdlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJhYmxl RG9tYWluJgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKG1f c3RhdGlzdGljc1N0b3JlKSB7Ci0gICAgICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZS0+Z3JhbnRT dG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVEb21haW4pLCBXVEZNb3ZlKHRvcEZyYW1lRG9t YWluKSwgZnJhbWVJRCwgcGFnZUlELCBwcm9tcHRXYXNTaG93biwgW3Byb21wdFdhc1Nob3duLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShTdG9yYWdlQWNj ZXNzV2FzR3JhbnRlZCB3YXNHcmFudGVkQWNjZXNzKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAg ICBwb3N0VGFza1JlcGx5KFt3YXNHcmFudGVkQWNjZXNzLCBwcm9tcHRXYXNTaG93biwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLSAg ICAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIod2FzR3JhbnRlZEFjY2VzcywgcHJv bXB0V2FzU2hvd24pOwotICAgICAgICAgICAgICAgIH0pOworICAgICAgICBtX3N0YXRpc3RpY3NT dG9yZS0+Z3JhbnRTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVEb21haW4pLCBXVEZNb3Zl KHRvcEZyYW1lRG9tYWluKSwgZnJhbWVJRCwgcGFnZUlELCBwcm9tcHRXYXNTaG93biwgW3Byb21w dFdhc1Nob3duLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XShTdG9yYWdlQWNjZXNzV2FzR3JhbnRlZCB3YXNHcmFudGVkQWNjZXNzKSBtdXRhYmxlIHsKKyAg ICAgICAgICAgIHBvc3RUYXNrUmVwbHkoW3dhc0dyYW50ZWRBY2Nlc3MsIHByb21wdFdhc1Nob3du LCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFi bGUgeworICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHdhc0dyYW50ZWRBY2Nlc3Ms IHByb21wdFdhc1Nob3duKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICB9CisgICAgICAgIH0p OwogICAgIH0pOwogfQogCg== 375079 2019-07-29 09:40:50 -0700 2019-07-29 13:15:50 -0700 Patch bug-200229-20190729094049.patch text/plain 5051 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3OTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyZmY3Yjg5YzJkYmIxZjUw MWQ0MDc3OTViMjJhODNiNzg0ODNkODIuLmZjMjJmZTY5ZjhmM2U5ZTI0YTYzZGJhYjk3M2EzNjYx Nzg3ZjQwOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDctMjkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgbnVs bCBjaGVjayB1bmRlciBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0b3JhZ2VB Y2Nlc3MoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAwMjI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIHVubmVjZXNzYXJ5IG51bGwgY2hlY2sgdW5kZXIgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpoYXNTdG9yYWdlQWNjZXNzKCkuCisgICAgICAgIFRoZXJlIGlzIGFscmVhZHkg YSBudWxsIGNoZWNrIHdpdGggYW4gZWFybHkgcmV0dXJuIGEgZmV3IGxpbmVzIGFib3ZlLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6Omhhc1N0b3JhZ2VBY2Nlc3MpOgorCiAyMDE5LTA3LTI3ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgbW9yZSBzeXNjYWxscyBpbiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzJyBzYW5kYm94IHByb2ZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggMzRlNDRlODVhZTBiNmI0ZDNhNTRmMDAw NmFiYjA5YWZmMThlYzJiYi4uMDgyODk3MGRlMzYxY2ZjY2UwNjRhZTc5YzgxZGMwZjUwY2FjZTRh MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK QEAgLTI5NiwxMyArMjk2LDExIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpoYXNTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiBzCiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobV9zdGF0aXN0aWNzU3RvcmUpIHsK LSAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlLT5oYXNTdG9yYWdlQWNjZXNzKHN1YkZyYW1l RG9tYWluLCB0b3BGcmFtZURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBbY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oYm9vbCBoYXNTdG9yYWdlQWNjZXNzKSBt dXRhYmxlIHsKLSAgICAgICAgICAgICAgICBwb3N0VGFza1JlcGx5KFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBoYXNTdG9yYWdlQWNjZXNzXSgpIG11dGFi bGUgewotICAgICAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihoYXNTdG9yYWdlQWNj ZXNzKTsKLSAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmhh c1N0b3JhZ2VBY2Nlc3Moc3ViRnJhbWVEb21haW4sIHRvcEZyYW1lRG9tYWluLCBmcmFtZUlELCBw YWdlSUQsIFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShi b29sIGhhc1N0b3JhZ2VBY2Nlc3MpIG11dGFibGUgeworICAgICAgICAgICAgcG9zdFRhc2tSZXBs eShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgaGFzU3Rv cmFnZUFjY2Vzc10oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihoYXNTdG9yYWdlQWNjZXNzKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICB9CisgICAgICAg IH0pOwogICAgIH0pOwogfQogCkBAIC00MDEsMTMgKzM5OSwxMSBAQCB2b2lkIFdlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJhYmxl RG9tYWluJgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKG1f c3RhdGlzdGljc1N0b3JlKSB7Ci0gICAgICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZS0+Z3JhbnRT dG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVEb21haW4pLCBXVEZNb3ZlKHRvcEZyYW1lRG9t YWluKSwgZnJhbWVJRCwgcGFnZUlELCBwcm9tcHRXYXNTaG93biwgW3Byb21wdFdhc1Nob3duLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShTdG9yYWdlQWNj ZXNzV2FzR3JhbnRlZCB3YXNHcmFudGVkQWNjZXNzKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAg ICBwb3N0VGFza1JlcGx5KFt3YXNHcmFudGVkQWNjZXNzLCBwcm9tcHRXYXNTaG93biwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLSAg ICAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIod2FzR3JhbnRlZEFjY2VzcywgcHJv bXB0V2FzU2hvd24pOwotICAgICAgICAgICAgICAgIH0pOworICAgICAgICBtX3N0YXRpc3RpY3NT dG9yZS0+Z3JhbnRTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVEb21haW4pLCBXVEZNb3Zl KHRvcEZyYW1lRG9tYWluKSwgZnJhbWVJRCwgcGFnZUlELCBwcm9tcHRXYXNTaG93biwgW3Byb21w dFdhc1Nob3duLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XShTdG9yYWdlQWNjZXNzV2FzR3JhbnRlZCB3YXNHcmFudGVkQWNjZXNzKSBtdXRhYmxlIHsKKyAg ICAgICAgICAgIHBvc3RUYXNrUmVwbHkoW3dhc0dyYW50ZWRBY2Nlc3MsIHByb21wdFdhc1Nob3du LCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFi bGUgeworICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHdhc0dyYW50ZWRBY2Nlc3Ms IHByb21wdFdhc1Nob3duKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICB9CisgICAgICAgIH0p OwogICAgIH0pOwogfQogCkBAIC04NzksMTYgKzg3NSwxNCBAQCB2b2lkIFdlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6c2NoZWR1bGVDbGVhckluTWVtb3J5QW5kUGVyc2lzdGVudChTaG91 bGRHcgogICAgICAgICAgICAgcG9zdFRhc2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KSk7CiAgICAgICAgIH0pOwogCi0gICAgICAgIGlmIChtX3N0YXRpc3RpY3NTdG9yZSkgewotICAg ICAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmNsZWFyKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0g cHJvdGVjdGVkVGhpcy5jb3B5UmVmKCksIHNob3VsZEdyYW5kZmF0aGVyLCBjYWxsYmFja0FnZ3Jl Z2F0b3IgPSBjYWxsYmFja0FnZ3JlZ2F0b3IuY29weVJlZigpXSAoKSBtdXRhYmxlIHsKLSAgICAg ICAgICAgICAgICBpZiAoc2hvdWxkR3JhbmRmYXRoZXIgPT0gU2hvdWxkR3JhbmRmYXRoZXJTdGF0 aXN0aWNzOjpZZXMpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKG1fc3RhdGlzdGljc1N0b3Jl KQotICAgICAgICAgICAgICAgICAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmdyYW5kZmF0aGVy RXhpc3RpbmdXZWJzaXRlRGF0YShbY2FsbGJhY2tBZ2dyZWdhdG9yID0gV1RGTW92ZShjYWxsYmFj a0FnZ3JlZ2F0b3IpXSgpIG11dGFibGUgeyB9KTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQot ICAgICAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coUmVzb3VyY2VMb2FkU3RhdGlzdGlj cywgIldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2NoZWR1bGVDbGVhckluTWVtb3J5 QW5kUGVyc2lzdGVudCBBZnRlciBiZWluZyBjbGVhcmVkLCBtX3N0YXRpc3RpY3NTdG9yZSBpcyBu dWxsIHdoZW4gdHJ5aW5nIHRvIGdyYW5kZmF0aGVyIGRhdGEuIik7Ci0gICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0KKyAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUt PmNsZWFyKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gcHJvdGVjdGVkVGhpcy5jb3B5UmVmKCksIHNo b3VsZEdyYW5kZmF0aGVyLCBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0FnZ3JlZ2F0b3Iu Y29weVJlZigpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhl ciA9PSBTaG91bGRHcmFuZGZhdGhlclN0YXRpc3RpY3M6OlllcykgeworICAgICAgICAgICAgICAg IGlmIChtX3N0YXRpc3RpY3NTdG9yZSkKKyAgICAgICAgICAgICAgICAgICAgbV9zdGF0aXN0aWNz U3RvcmUtPmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YShbY2FsbGJhY2tBZ2dyZWdhdG9y ID0gV1RGTW92ZShjYWxsYmFja0FnZ3JlZ2F0b3IpXSgpIG11dGFibGUgeyB9KTsKKyAgICAgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HKFJlc291cmNlTG9h ZFN0YXRpc3RpY3MsICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xl YXJJbk1lbW9yeUFuZFBlcnNpc3RlbnQgQWZ0ZXIgYmVpbmcgY2xlYXJlZCwgbV9zdGF0aXN0aWNz U3RvcmUgaXMgbnVsbCB3aGVuIHRyeWluZyB0byBncmFuZGZhdGhlciBkYXRhLiIpOworICAgICAg ICAgICAgfQorICAgICAgICB9KTsKICAgICB9KTsKIH0KIAo=