208206 2020-02-25 09:40:29 -0800 Tests should each use a unique ResourceLoadStatistics file path for its database store 2020-04-16 08:45:36 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney beidson commit-queue Lawrence.j webkit-bug-importer oldest_to_newest 1622652 0 katherine_cheney 2020-02-25 09:40:29 -0800 This is causing issues with tests trying to delete file paths for databases which are still in use 1622653 1 katherine_cheney 2020-02-25 09:41:42 -0800 <rdar://problem/59690272> 1622685 2 391672 katherine_cheney 2020-02-25 11:10:22 -0800 Created attachment 391672 Patch 1622766 3 391672 ap 2020-02-25 14:55:34 -0800 Comment on attachment 391672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391672&action=review > Source/WebKit/ChangeLog:13 > + WebKitTestRunner. This was causing crashes and concurrency issues in tests > + when multiple database stores at the same path are accessed > + simultaneously. I'll leave it to someone who knows this code to review the patch, but this is exciting! > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:180 > - // FIXME(193297): This should be revised after the UIProcess version goes away. > - m_statisticsStore->didCreateNetworkProcess(); > - }); > + // FIXME(193297): This should be revised after the UIProcess version goes away. Bug 193297 is marked as fixed, it would be helpful to update this comment with what needs to be done. Not required for this patch, but you touched the line. 1622767 4 ap 2020-02-25 14:55:42 -0800 (also, API tests failed) 1622874 5 391708 katherine_cheney 2020-02-25 17:54:12 -0800 Created attachment 391708 Patch 1622875 6 katherine_cheney 2020-02-25 17:54:33 -0800 (In reply to Alexey Proskuryakov from comment #4) > (also, API tests failed) This patch should fix it. 1622876 7 katherine_cheney 2020-02-25 17:55:35 -0800 (In reply to Alexey Proskuryakov from comment #3) > Comment on attachment 391672 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=391672&action=review > > > Source/WebKit/ChangeLog:13 > > + WebKitTestRunner. This was causing crashes and concurrency issues in tests > > + when multiple database stores at the same path are accessed > > + simultaneously. > > I'll leave it to someone who knows this code to review the patch, but this > is exciting! I know! I think this will solve many of the DB flaky test issues. 1623191 8 391708 commit-queue 2020-02-26 14:44:08 -0800 Comment on attachment 391708 Patch Clearing flags on attachment: 391708 Committed r257519: <https://trac.webkit.org/changeset/257519> 1623192 9 commit-queue 2020-02-26 14:44:10 -0800 All reviewed patches have been landed. Closing bug. 1623193 10 webkit-bug-importer 2020-02-26 14:45:18 -0800 <rdar://problem/59822319> 1642266 11 katherine_cheney 2020-04-16 08:45:36 -0700 *** Bug 207938 has been marked as a duplicate of this bug. *** 391672 2020-02-25 11:10:22 -0800 2020-02-25 17:54:10 -0800 Patch bug-208206-20200225111021.patch text/plain 10186 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2MzNjZjk4NTI4Y2E5Njdj NDkyYTg4ZGM5ODA4MGEzZWNmMjFhM2MuLjA4OGY2NzI3YzkyYmY1ZDI3N2Q4NGZmZGU1OWIwYzIz MTMzOThiMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjAtMDItMjUgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgVGVzdHMgc2hvdWxk IGVhY2ggdXNlIGEgdW5pcXVlIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgZmlsZSBwYXRoIGZvciBp dHMgZGF0YWJhc2Ugc3RvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwODIwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk2OTAyNzI+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFJlc291cmNl TG9hZFN0YXRpc3RpY3MgZGlyZWN0b3J5IHdhcyBiZWluZyBzZXQgdG8gYSBub24tdW5pcXVlCisg ICAgICAgIGRlZmF1bHQgdmFsdWUgYmVmb3JlIGJlaW5nIGNyZWF0ZWQgYXQgdGhlIHRlbXBvcmFy eSBwYXRoIGdlbmVyYXRlZCBieQorICAgICAgICBXZWJLaXRUZXN0UnVubmVyLiBUaGlzIHdhcyBj YXVzaW5nIGNyYXNoZXMgYW5kIGNvbmN1cnJlbmN5IGlzc3VlcyBpbiB0ZXN0cyAKKyAgICAgICAg d2hlbiBtdWx0aXBsZSBkYXRhYmFzZSBzdG9yZXMgYXQgdGhlIHNhbWUgcGF0aCBhcmUgYWNjZXNz ZWQKKyAgICAgICAgc2ltdWx0YW5lb3VzbHkuCisKKyAgICAgICAgVGhpcyBwYXRjaCB1cGRhdGVz IFdlYlByb2Nlc3NQb29sLmNwcCB0byB0cmVhdCB0aGUKKyAgICAgICAgcmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RpcmVjdG9yeSBwYXJhbWV0ZXIgbGlrZSBpdCBkb2VzIHdpdGggSW5kZXhlZERCCisg ICAgICAgIHRvIGF2b2lkIGluaXRpYWxpemluZyBtdWx0aXBsZSBkYXRhYmFzZXMgYXQgdGhlIHNh bWUgZmlsZSBwYXRoLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJl c291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpvcGVuQW5kRHJvcE9sZERhdGFiYXNl SWZOZWNlc3NhcnkpOgorICAgICAgICBXZSBzaG91bGQgdXNlIFNRTGl0ZUZpbGVTeXN0ZW06OmRl bGV0ZURhdGFiYXNlRmlsZSBiZWNhdXNlIGl0IHRha2VzCisgICAgICAgIGNhcmUgb2YgYWRkaXRp b25hbCBTUUxpdGUgZmlsZXMgYXV0b21hdGljYWxseS4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OnBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayk6CisgICAgICAgIENoZWNr cyBpZiB0aGUgcGF0aCBpcyBlbXB0eSBiZWNhdXNlIHdlIG5vIGxvbmdlcgorICAgICAgICBndWFy YW50ZWUgdGhhdCB0aGUgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSBpcyBzZXQuIEFs c28gY2hlY2tzCisgICAgICAgIGlmIG1fc3RhdGlzdGljc1N0b3JlIGlzIGluaXRpYWxpemVkIGJl Zm9yZSB0cnlpbmcgdG8gZ3JhbmRmYXRoZXIKKyAgICAgICAgc3RhdGlzdGljcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjplbnN1cmVOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgIENoZWNrcyBpZiBhIGRl ZmF1bHQgV2Vic2l0ZURhdGFTdG9yZSBleGlzdHMgYmVmb3JlIHNldHRpbmcgdGhlCisgICAgICAg IHBhcmFtZXRlciB0byB0aGUgZGVmYXVsdCB2YWx1ZS4gVGhpcyB3YXksIHRoZSBwYXJhbWV0ZXIg aXMgZW1wdHkgaWYKKyAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBoYXNuJ3QgeWV0IHNldCB0aGUg dGVtcG9yYXJ5IGRpcmVjdG9yeSBhbmQgd2Ugd29uJ3QKKyAgICAgICAgY3JlYXRlIGEgbmV3IGRh dGFiYXNlLgorCiAyMDIwLTAyLTI1ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCBhZGRpdGlvbnMgdG8gTmV0d29ya0RhdGFUYXNrQ29jb2EK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXgg ODMyNmEzZDkwODg4ODhmZjM0Nzk1MjA1NDNlMjVkNjYzZTQwNDBkMC4uYjAwYzg4MjVlYmVlZWFh YWUzNDAwZGI4ZjE0N2M2NjNmNDE5ZjMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTUyLDYgKzUyLDcgQEAKICNpbmNsdWRlIDxXZWJD b3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VM b2FkU3RhdGlzdGljcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU1FMaXRlRGF0YWJhc2UuaD4KKyNp bmNsdWRlIDxXZWJDb3JlL1NRTGl0ZUZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NR TGl0ZVN0YXRlbWVudC5oPgogI2luY2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNp bmNsdWRlIDx3dGYvQ3Jvc3NUaHJlYWRDb3BpZXIuaD4KQEAgLTE1NywzNiArMTU4LDMxIEBAIFdl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlKE5ldHdvcmtTZXNzaW9uJiBuCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoUnVuTG9vcDo6aXNN YWluKCkpOwogCi0gICAgcG9zdFRhc2soW3RoaXMsIGRhdGFiYXNlRW5hYmxlZCA9IG5ldHdvcmtT ZXNzaW9uLm5ldHdvcmtQcm9jZXNzKCkuaXNJVFBEYXRhYmFzZUVuYWJsZWQoKSwgcmVzb3VyY2VM b2FkU3RhdGlzdGljc0RpcmVjdG9yeSA9IHJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnku aXNvbGF0ZWRDb3B5KCksIHNob3VsZEluY2x1ZGVMb2NhbGhvc3QsIHNlc3Npb25JRCA9IG5ldHdv cmtTZXNzaW9uLnNlc3Npb25JRCgpXSB7Ci0gICAgICAgIGlmIChkYXRhYmFzZUVuYWJsZWQpIHsK LSAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZT4oKnRoaXMsIG1fc3RhdGlzdGljc1F1ZXVlLCBzaG91bGRJ bmNsdWRlTG9jYWxob3N0LCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCBzZXNzaW9u SUQpOworICAgIGlmICghcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeS5pc0VtcHR5KCkp IHsKKyAgICAgICAgcG9zdFRhc2soW3RoaXMsIGRhdGFiYXNlRW5hYmxlZCA9IG5ldHdvcmtTZXNz aW9uLm5ldHdvcmtQcm9jZXNzKCkuaXNJVFBEYXRhYmFzZUVuYWJsZWQoKSwgcmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RpcmVjdG9yeSA9IHJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkuaXNv bGF0ZWRDb3B5KCksIHNob3VsZEluY2x1ZGVMb2NhbGhvc3QsIHNlc3Npb25JRCA9IG5ldHdvcmtT ZXNzaW9uLnNlc3Npb25JRCgpXSB7CisgICAgICAgICAgICBpZiAoZGF0YWJhc2VFbmFibGVkKSB7 CisgICAgICAgICAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUgPSBtYWtlVW5pcXVlPFJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlPigqdGhpcywgbV9zdGF0aXN0aWNzUXVldWUsIHNo b3VsZEluY2x1ZGVMb2NhbGhvc3QsIHJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnksIHNl c3Npb25JRCk7CiAKLSAgICAgICAgICAgIGF1dG8gbWVtb3J5U3RvcmUgPSBtYWtlVW5pcXVlPFJl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZT4oKnRoaXMsIG1fc3RhdGlzdGljc1F1ZXVl LCBzaG91bGRJbmNsdWRlTG9jYWxob3N0KTsKLSAgICAgICAgICAgIGRvd25jYXN0PFJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUuZ2V0KCkpLnBv cHVsYXRlRnJvbU1lbW9yeVN0b3JlKCptZW1vcnlTdG9yZSk7CisgICAgICAgICAgICAgICAgYXV0 byBtZW1vcnlTdG9yZSA9IG1ha2VVbmlxdWU8UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0 b3JlPigqdGhpcywgbV9zdGF0aXN0aWNzUXVldWUsIHNob3VsZEluY2x1ZGVMb2NhbGhvc3QpOwor ICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0 b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUuZ2V0KCkpLnBvcHVsYXRlRnJvbU1lbW9yeVN0b3JlKCpt ZW1vcnlTdG9yZSk7CiAKLSAgICAgICAgICAgIGF1dG8gbGVnYWN5UGxpc3RGaWxlUGF0aCA9IEZp bGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGlyZWN0b3J5LCAiZnVsbF9icm93c2luZ19zZXNzaW9uX3Jlc291cmNlTG9nLnBsaXN0Iik7Ci0g ICAgICAgICAgICBpZiAoRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhsZWdhY3lQbGlzdEZpbGVQYXRo KSkKLSAgICAgICAgICAgICAgICBGaWxlU3lzdGVtOjpkZWxldGVGaWxlKGxlZ2FjeVBsaXN0Rmls ZVBhdGgpOworICAgICAgICAgICAgICAgIGF1dG8gbGVnYWN5UGxpc3RGaWxlUGF0aCA9IEZpbGVT eXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGly ZWN0b3J5LCAiZnVsbF9icm93c2luZ19zZXNzaW9uX3Jlc291cmNlTG9nLnBsaXN0Iik7CisgICAg ICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobGVnYWN5UGxpc3RGaWxlUGF0 aCkpCisgICAgICAgICAgICAgICAgICAgIEZpbGVTeXN0ZW06OmRlbGV0ZUZpbGUobGVnYWN5UGxp c3RGaWxlUGF0aCk7CiAKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG1fc3RhdGlzdGlj c1N0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU+KCp0 aGlzLCBtX3N0YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5jbHVkZUxvY2FsaG9zdCk7Ci0gICAgICAg ICAgICBtX3BlcnNpc3RlbnRTdG9yYWdlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzUGVyc2lzdGVudFN0b3JhZ2U+KGRvd25jYXN0PFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1v cnlTdG9yZT4oKm1fc3RhdGlzdGljc1N0b3JlKSwgbV9zdGF0aXN0aWNzUXVldWUsIHJlc291cmNl TG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZSA9IG1ha2VVbmlxdWU8UmVzb3VyY2VMb2FkU3RhdGlz dGljc01lbW9yeVN0b3JlPigqdGhpcywgbV9zdGF0aXN0aWNzUXVldWUsIHNob3VsZEluY2x1ZGVM b2NhbGhvc3QpOworICAgICAgICAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UgPSBtYWtlVW5p cXVlPFJlc291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZT4oZG93bmNhc3Q8UmVz b3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUpLCBtX3N0 YXRpc3RpY3NRdWV1ZSwgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSk7CiAKLSAgICAg ICAgICAgIGF1dG8gZGF0YWJhc2VTdG9yYWdlRmlsZVBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlB cHBlbmRpbmdDb21wb25lbnQocmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSwgIm9ic2Vy dmF0aW9ucy5kYiIpOwotICAgICAgICAgICAgYXV0byBkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlX YWxGaWxlUGF0aCA9IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCAib2JzZXJ2YXRpb25zLmRiLXdhbCIpOwotICAgICAg ICAgICAgYXV0byBkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlTaG1GaWxlUGF0aCA9IEZpbGVTeXN0 ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0 b3J5LCAib2JzZXJ2YXRpb25zLmRiLXNobSIpOwotICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06 OmZpbGVFeGlzdHMoZGF0YWJhc2VTdG9yYWdlRmlsZVBhdGgpKSB7Ci0gICAgICAgICAgICAgICAg RmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VGaWxlUGF0aCk7Ci0gICAgICAg ICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlX YWxGaWxlUGF0aCk7Ci0gICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRh YmFzZVN0b3JhZ2VUZW1wb3JhcnlTaG1GaWxlUGF0aCk7CisgICAgICAgICAgICAgICAgU1FMaXRl RmlsZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGlu Z0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCAib2JzZXJ2YXRpb25z LmRiIikpOwogICAgICAgICAgICAgfQotICAgICAgICB9CiAKLSAgICAgICAgLy8gRklYTUUoMTkz Mjk3KTogVGhpcyBzaG91bGQgYmUgcmV2aXNlZCBhZnRlciB0aGUgVUlQcm9jZXNzIHZlcnNpb24g Z29lcyBhd2F5LgotICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZS0+ZGlkQ3JlYXRlTmV0d29ya1By b2Nlc3MoKTsKLSAgICB9KTsKKyAgICAgICAgICAgIC8vIEZJWE1FKDE5MzI5Nyk6IFRoaXMgc2hv dWxkIGJlIHJldmlzZWQgYWZ0ZXIgdGhlIFVJUHJvY2VzcyB2ZXJzaW9uIGdvZXMgYXdheS4KKyAg ICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlLT5kaWRDcmVhdGVOZXR3b3JrUHJvY2VzcygpOwor ICAgICAgICB9KTsKIAotICAgIG1fZGFpbHlUYXNrc1RpbWVyLnN0YXJ0UmVwZWF0aW5nKDI0X2gp OworICAgICAgICBtX2RhaWx5VGFza3NUaW1lci5zdGFydFJlcGVhdGluZygyNF9oKTsKKyAgICB9 CiB9CiAKIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6fldlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZSgpCkBAIC0yNDQsNyArMjQwLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OnBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayhDb21wbGV0aW9uSGFu ZGwKICAgICAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UtPnBvcHVsYXRlTWVtb3J5U3RvcmVG cm9tRGlzayhbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAg ICAgICAgICAgICAgcG9zdFRhc2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiAg ICAgICAgICAgICB9KTsKLSAgICAgICAgZWxzZSBpZiAoaXM8UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RhdGFiYXNlU3RvcmU+KCptX3N0YXRpc3RpY3NTdG9yZSkpIHsKKyAgICAgICAgZWxzZSBpZiAo bV9zdGF0aXN0aWNzU3RvcmUgJiYgaXM8UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3Rv cmU+KCptX3N0YXRpc3RpY3NTdG9yZSkpIHsKICAgICAgICAgICAgIGF1dG8mIGRhdGFiYXNlU3Rv cmUgPSBkb3duY2FzdDxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZT4oKm1fc3Rh dGlzdGljc1N0b3JlKTsKICAgICAgICAgICAgIGlmIChkYXRhYmFzZVN0b3JlLmlzTmV3UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlRmlsZSgpKSB7CiAgICAgICAgICAgICAgICAgbV9zdGF0 aXN0aWNzU3RvcmUtPmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YShbcHJvdGVjdGVkVGhp cyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggMzQyMjYwZjBjNjlhMTdiNDJmMDEyYjdlZGQ1Mzg2ZmI2 NmIyYWU5Ni4uZDlmMDJiYzUxNWY5ZTNiNjgzNTc2MzE1N2IwOWM4MDRjMDQ0ZGY4YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtNTcxLDEwICs1NzEs MTEgQEAgTmV0d29ya1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQ cm9jZXNzKFdlYnNpdGVEYXRhU3RvcmUqIHdpdGgKIAogICAgIGlmIChtX3dlYnNpdGVEYXRhU3Rv cmUpCiAgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29y a1Nlc3Npb25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkgPSBtX3dl YnNpdGVEYXRhU3RvcmUtPnJlc29sdmVkUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSgp OwotICAgIGlmIChwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtT ZXNzaW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LmlzRW1wdHko KSkKLSAgICAgICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3Jr U2Vzc2lvblBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSA9IFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rv cnkoKTsKLQotICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURp cmVjdG9yeShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNz aW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCBwYXJhbWV0ZXJz LmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5yZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICBlbHNlIGlm IChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVFeGlzdHMoKSkKKyAg ICAgICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lv blBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSA9IFdlYktpdDo6V2Vi c2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZSgpLT5wYXJhbWV0ZXJzKCkubmV0d29ya1Nl c3Npb25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnk7CisgICAgCisg ICAgaWYgKCFwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNz aW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LmlzRW1wdHkoKSkK KyAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0 b3J5KHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25Q YXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnksIHBhcmFtZXRlcnMuZGVm YXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnJlc291cmNl TG9hZFN0YXRpc3RpY3NEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogCiAgICAgYm9vbCBlbmFi bGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gZmFsc2U7CiAgICAgYm9vbCBlbmFibGVSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzTG9nVGVzdGluZ0V2ZW50ID0gZmFsc2U7Cg== 391708 2020-02-25 17:54:12 -0800 2020-02-26 14:44:08 -0800 Patch bug-208206-20200225175411.patch text/plain 12112 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2MzNjZjk4NTI4Y2E5Njdj NDkyYTg4ZGM5ODA4MGEzZWNmMjFhM2MuLjA4OGY2NzI3YzkyYmY1ZDI3N2Q4NGZmZGU1OWIwYzIz MTMzOThiMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjAtMDItMjUgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgVGVzdHMgc2hvdWxk IGVhY2ggdXNlIGEgdW5pcXVlIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgZmlsZSBwYXRoIGZvciBp dHMgZGF0YWJhc2Ugc3RvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwODIwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk2OTAyNzI+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFJlc291cmNl TG9hZFN0YXRpc3RpY3MgZGlyZWN0b3J5IHdhcyBiZWluZyBzZXQgdG8gYSBub24tdW5pcXVlCisg ICAgICAgIGRlZmF1bHQgdmFsdWUgYmVmb3JlIGJlaW5nIGNyZWF0ZWQgYXQgdGhlIHRlbXBvcmFy eSBwYXRoIGdlbmVyYXRlZCBieQorICAgICAgICBXZWJLaXRUZXN0UnVubmVyLiBUaGlzIHdhcyBj YXVzaW5nIGNyYXNoZXMgYW5kIGNvbmN1cnJlbmN5IGlzc3VlcyBpbiB0ZXN0cyAKKyAgICAgICAg d2hlbiBtdWx0aXBsZSBkYXRhYmFzZSBzdG9yZXMgYXQgdGhlIHNhbWUgcGF0aCBhcmUgYWNjZXNz ZWQKKyAgICAgICAgc2ltdWx0YW5lb3VzbHkuCisKKyAgICAgICAgVGhpcyBwYXRjaCB1cGRhdGVz IFdlYlByb2Nlc3NQb29sLmNwcCB0byB0cmVhdCB0aGUKKyAgICAgICAgcmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RpcmVjdG9yeSBwYXJhbWV0ZXIgbGlrZSBpdCBkb2VzIHdpdGggSW5kZXhlZERCCisg ICAgICAgIHRvIGF2b2lkIGluaXRpYWxpemluZyBtdWx0aXBsZSBkYXRhYmFzZXMgYXQgdGhlIHNh bWUgZmlsZSBwYXRoLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJl c291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpvcGVuQW5kRHJvcE9sZERhdGFiYXNl SWZOZWNlc3NhcnkpOgorICAgICAgICBXZSBzaG91bGQgdXNlIFNRTGl0ZUZpbGVTeXN0ZW06OmRl bGV0ZURhdGFiYXNlRmlsZSBiZWNhdXNlIGl0IHRha2VzCisgICAgICAgIGNhcmUgb2YgYWRkaXRp b25hbCBTUUxpdGUgZmlsZXMgYXV0b21hdGljYWxseS4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OnBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayk6CisgICAgICAgIENoZWNr cyBpZiB0aGUgcGF0aCBpcyBlbXB0eSBiZWNhdXNlIHdlIG5vIGxvbmdlcgorICAgICAgICBndWFy YW50ZWUgdGhhdCB0aGUgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSBpcyBzZXQuIEFs c28gY2hlY2tzCisgICAgICAgIGlmIG1fc3RhdGlzdGljc1N0b3JlIGlzIGluaXRpYWxpemVkIGJl Zm9yZSB0cnlpbmcgdG8gZ3JhbmRmYXRoZXIKKyAgICAgICAgc3RhdGlzdGljcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjplbnN1cmVOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgIENoZWNrcyBpZiBhIGRl ZmF1bHQgV2Vic2l0ZURhdGFTdG9yZSBleGlzdHMgYmVmb3JlIHNldHRpbmcgdGhlCisgICAgICAg IHBhcmFtZXRlciB0byB0aGUgZGVmYXVsdCB2YWx1ZS4gVGhpcyB3YXksIHRoZSBwYXJhbWV0ZXIg aXMgZW1wdHkgaWYKKyAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBoYXNuJ3QgeWV0IHNldCB0aGUg dGVtcG9yYXJ5IGRpcmVjdG9yeSBhbmQgd2Ugd29uJ3QKKyAgICAgICAgY3JlYXRlIGEgbmV3IGRh dGFiYXNlLgorCiAyMDIwLTAyLTI1ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCBhZGRpdGlvbnMgdG8gTmV0d29ya0RhdGFUYXNrQ29jb2EK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXgg ODMyNmEzZDkwODg4ODhmZjM0Nzk1MjA1NDNlMjVkNjYzZTQwNDBkMC4uMWEyODRlNDVkZGIzZjEw MjAyNjdjOTU4NWQ3MTFjMDljMzNiYTNjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTUyLDYgKzUyLDcgQEAKICNpbmNsdWRlIDxXZWJD b3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VM b2FkU3RhdGlzdGljcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU1FMaXRlRGF0YWJhc2UuaD4KKyNp bmNsdWRlIDxXZWJDb3JlL1NRTGl0ZUZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NR TGl0ZVN0YXRlbWVudC5oPgogI2luY2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNp bmNsdWRlIDx3dGYvQ3Jvc3NUaHJlYWRDb3BpZXIuaD4KQEAgLTE1NywzNiArMTU4LDMwIEBAIFdl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlKE5ldHdvcmtTZXNzaW9uJiBuCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoUnVuTG9vcDo6aXNN YWluKCkpOwogCi0gICAgcG9zdFRhc2soW3RoaXMsIGRhdGFiYXNlRW5hYmxlZCA9IG5ldHdvcmtT ZXNzaW9uLm5ldHdvcmtQcm9jZXNzKCkuaXNJVFBEYXRhYmFzZUVuYWJsZWQoKSwgcmVzb3VyY2VM b2FkU3RhdGlzdGljc0RpcmVjdG9yeSA9IHJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnku aXNvbGF0ZWRDb3B5KCksIHNob3VsZEluY2x1ZGVMb2NhbGhvc3QsIHNlc3Npb25JRCA9IG5ldHdv cmtTZXNzaW9uLnNlc3Npb25JRCgpXSB7Ci0gICAgICAgIGlmIChkYXRhYmFzZUVuYWJsZWQpIHsK LSAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZT4oKnRoaXMsIG1fc3RhdGlzdGljc1F1ZXVlLCBzaG91bGRJ bmNsdWRlTG9jYWxob3N0LCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCBzZXNzaW9u SUQpOworICAgIGlmICghcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeS5pc0VtcHR5KCkp IHsKKyAgICAgICAgcG9zdFRhc2soW3RoaXMsIGRhdGFiYXNlRW5hYmxlZCA9IG5ldHdvcmtTZXNz aW9uLm5ldHdvcmtQcm9jZXNzKCkuaXNJVFBEYXRhYmFzZUVuYWJsZWQoKSwgcmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RpcmVjdG9yeSA9IHJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkuaXNv bGF0ZWRDb3B5KCksIHNob3VsZEluY2x1ZGVMb2NhbGhvc3QsIHNlc3Npb25JRCA9IG5ldHdvcmtT ZXNzaW9uLnNlc3Npb25JRCgpXSB7CisgICAgICAgICAgICBpZiAoZGF0YWJhc2VFbmFibGVkKSB7 CisgICAgICAgICAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUgPSBtYWtlVW5pcXVlPFJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlPigqdGhpcywgbV9zdGF0aXN0aWNzUXVldWUsIHNo b3VsZEluY2x1ZGVMb2NhbGhvc3QsIHJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnksIHNl c3Npb25JRCk7CiAKLSAgICAgICAgICAgIGF1dG8gbWVtb3J5U3RvcmUgPSBtYWtlVW5pcXVlPFJl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZT4oKnRoaXMsIG1fc3RhdGlzdGljc1F1ZXVl LCBzaG91bGRJbmNsdWRlTG9jYWxob3N0KTsKLSAgICAgICAgICAgIGRvd25jYXN0PFJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUuZ2V0KCkpLnBv cHVsYXRlRnJvbU1lbW9yeVN0b3JlKCptZW1vcnlTdG9yZSk7CisgICAgICAgICAgICAgICAgYXV0 byBtZW1vcnlTdG9yZSA9IG1ha2VVbmlxdWU8UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0 b3JlPigqdGhpcywgbV9zdGF0aXN0aWNzUXVldWUsIHNob3VsZEluY2x1ZGVMb2NhbGhvc3QpOwor ICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0 b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUuZ2V0KCkpLnBvcHVsYXRlRnJvbU1lbW9yeVN0b3JlKCpt ZW1vcnlTdG9yZSk7CiAKLSAgICAgICAgICAgIGF1dG8gbGVnYWN5UGxpc3RGaWxlUGF0aCA9IEZp bGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGlyZWN0b3J5LCAiZnVsbF9icm93c2luZ19zZXNzaW9uX3Jlc291cmNlTG9nLnBsaXN0Iik7Ci0g ICAgICAgICAgICBpZiAoRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhsZWdhY3lQbGlzdEZpbGVQYXRo KSkKLSAgICAgICAgICAgICAgICBGaWxlU3lzdGVtOjpkZWxldGVGaWxlKGxlZ2FjeVBsaXN0Rmls ZVBhdGgpOworICAgICAgICAgICAgICAgIGF1dG8gbGVnYWN5UGxpc3RGaWxlUGF0aCA9IEZpbGVT eXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGly ZWN0b3J5LCAiZnVsbF9icm93c2luZ19zZXNzaW9uX3Jlc291cmNlTG9nLnBsaXN0Iik7CisgICAg ICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobGVnYWN5UGxpc3RGaWxlUGF0 aCkpCisgICAgICAgICAgICAgICAgICAgIEZpbGVTeXN0ZW06OmRlbGV0ZUZpbGUobGVnYWN5UGxp c3RGaWxlUGF0aCk7CiAKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG1fc3RhdGlzdGlj c1N0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU+KCp0 aGlzLCBtX3N0YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5jbHVkZUxvY2FsaG9zdCk7Ci0gICAgICAg ICAgICBtX3BlcnNpc3RlbnRTdG9yYWdlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzUGVyc2lzdGVudFN0b3JhZ2U+KGRvd25jYXN0PFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1v cnlTdG9yZT4oKm1fc3RhdGlzdGljc1N0b3JlKSwgbV9zdGF0aXN0aWNzUXVldWUsIHJlc291cmNl TG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZSA9IG1ha2VVbmlxdWU8UmVzb3VyY2VMb2FkU3RhdGlz dGljc01lbW9yeVN0b3JlPigqdGhpcywgbV9zdGF0aXN0aWNzUXVldWUsIHNob3VsZEluY2x1ZGVM b2NhbGhvc3QpOworICAgICAgICAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UgPSBtYWtlVW5p cXVlPFJlc291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZT4oZG93bmNhc3Q8UmVz b3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUpLCBtX3N0 YXRpc3RpY3NRdWV1ZSwgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSk7CiAKLSAgICAg ICAgICAgIGF1dG8gZGF0YWJhc2VTdG9yYWdlRmlsZVBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlB cHBlbmRpbmdDb21wb25lbnQocmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSwgIm9ic2Vy dmF0aW9ucy5kYiIpOwotICAgICAgICAgICAgYXV0byBkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlX YWxGaWxlUGF0aCA9IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCAib2JzZXJ2YXRpb25zLmRiLXdhbCIpOwotICAgICAg ICAgICAgYXV0byBkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlTaG1GaWxlUGF0aCA9IEZpbGVTeXN0 ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0 b3J5LCAib2JzZXJ2YXRpb25zLmRiLXNobSIpOwotICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06 OmZpbGVFeGlzdHMoZGF0YWJhc2VTdG9yYWdlRmlsZVBhdGgpKSB7Ci0gICAgICAgICAgICAgICAg RmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VGaWxlUGF0aCk7Ci0gICAgICAg ICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlX YWxGaWxlUGF0aCk7Ci0gICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRh YmFzZVN0b3JhZ2VUZW1wb3JhcnlTaG1GaWxlUGF0aCk7CisgICAgICAgICAgICAgICAgU1FMaXRl RmlsZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGlu Z0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCAib2JzZXJ2YXRpb25z LmRiIikpOwogICAgICAgICAgICAgfQotICAgICAgICB9CiAKLSAgICAgICAgLy8gRklYTUUoMTkz Mjk3KTogVGhpcyBzaG91bGQgYmUgcmV2aXNlZCBhZnRlciB0aGUgVUlQcm9jZXNzIHZlcnNpb24g Z29lcyBhd2F5LgotICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZS0+ZGlkQ3JlYXRlTmV0d29ya1By b2Nlc3MoKTsKLSAgICB9KTsKKyAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlLT5kaWRDcmVh dGVOZXR3b3JrUHJvY2VzcygpOworICAgICAgICB9KTsKIAotICAgIG1fZGFpbHlUYXNrc1RpbWVy LnN0YXJ0UmVwZWF0aW5nKDI0X2gpOworICAgICAgICBtX2RhaWx5VGFza3NUaW1lci5zdGFydFJl cGVhdGluZygyNF9oKTsKKyAgICB9CiB9CiAKIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6fldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSgpCkBAIC0yNDQsNyArMjM5LDcgQEAg dm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnBvcHVsYXRlTWVtb3J5U3RvcmVG cm9tRGlzayhDb21wbGV0aW9uSGFuZGwKICAgICAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2Ut PnBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayhbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJv dGVjdGVkVGhpcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl cildKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgcG9zdFRhc2tSZXBseShXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7CiAgICAgICAgICAgICB9KTsKLSAgICAgICAgZWxzZSBpZiAoaXM8 UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU+KCptX3N0YXRpc3RpY3NTdG9yZSkp IHsKKyAgICAgICAgZWxzZSBpZiAobV9zdGF0aXN0aWNzU3RvcmUgJiYgaXM8UmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU+KCptX3N0YXRpc3RpY3NTdG9yZSkpIHsKICAgICAgICAg ICAgIGF1dG8mIGRhdGFiYXNlU3RvcmUgPSBkb3duY2FzdDxSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZT4oKm1fc3RhdGlzdGljc1N0b3JlKTsKICAgICAgICAgICAgIGlmIChkYXRh YmFzZVN0b3JlLmlzTmV3UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlRmlsZSgpKSB7CiAg ICAgICAgICAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJz aXRlRGF0YShbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggMzQyMjYwZjBjNjlh MTdiNDJmMDEyYjdlZGQ1Mzg2ZmI2NmIyYWU5Ni4uZDlmMDJiYzUxNWY5ZTNiNjgzNTc2MzE1N2Iw OWM4MDRjMDQ0ZGY4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcApAQCAtNTcxLDEwICs1NzEsMTEgQEAgTmV0d29ya1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vz c1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKFdlYnNpdGVEYXRhU3RvcmUqIHdpdGgKIAogICAg IGlmIChtX3dlYnNpdGVEYXRhU3RvcmUpCiAgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFT dG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRp c3RpY3NEaXJlY3RvcnkgPSBtX3dlYnNpdGVEYXRhU3RvcmUtPnJlc29sdmVkUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RpcmVjdG9yeSgpOwotICAgIGlmIChwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3Rv cmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGlyZWN0b3J5LmlzRW1wdHkoKSkKLSAgICAgICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0 b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlz dGljc0RpcmVjdG9yeSA9IFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdFJlc291cmNl TG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoKTsKLQotICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0 ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQ YXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGlyZWN0b3J5LCBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtT ZXNzaW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5RXh0ZW5zaW9u SGFuZGxlKTsKKyAgICBlbHNlIGlmIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRE YXRhU3RvcmVFeGlzdHMoKSkKKyAgICAgICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFy YW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rp cmVjdG9yeSA9IFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZSgpLT5w YXJhbWV0ZXJzKCkubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEaXJlY3Rvcnk7CisgICAgCisgICAgaWYgKCFwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQ YXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFu ZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFt ZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJl Y3RvcnksIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Np b25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnlFeHRlbnNpb25IYW5k bGUpOwogCiAgICAgYm9vbCBlbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gZmFsc2U7CiAg ICAgYm9vbCBlbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTG9nVGVzdGluZ0V2ZW50ID0gZmFs c2U7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg MTBhZTdlZTZiNzk1YmQyN2E4MDk1YTQyMWVkYzBiZDM0NTNlM2Q5Ny4uYzUyZDI3MjcwYTlmMzdh MmUyMTI0OTU4MTdlMjRlMWM3MGY5OWY2ZSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAyLTI1ICBLYXRlIENo ZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFRlc3RzIHNob3Vs ZCBlYWNoIHVzZSBhIHVuaXF1ZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIGZpbGUgcGF0aCBmb3Ig aXRzIGRhdGFiYXNlIHN0b3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDgyMDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5NjkwMjcyPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluaXRpYWxpemUg YSBkZWZhdWx0IHdlYnNpdGUgZGF0YSBzdG9yZSBiZWZvcmUgY2hlY2tpbmcgZm9yIHRoZSBJVFAK KyAgICAgICAgc3RvcmUgdG8gZW5zdXJlIHRoZSBkaXJlY3RvcnkgZXhpc3RzIGFmdGVyIHRoZSBm aWxlIGhhcyBiZWVuIGRlbGV0ZWQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbToKKyAgICAgICAgKFRFU1Qp OgorCiAyMDIwLTAyLTI1ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAg ICAgIHNwaW5SdW5Mb29wIHNob3VsZCB0YWtlIGEgbm9uLXplcm8gaW50ZWdlciBhcyBwYXJhbWV0 ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vi c2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0KaW5kZXggMDM4MWQwOTQ0 YTczMzE4OTYwZTg3YTA1ZWE0YzMxMGVlZjZjMTY4NS4uODljODY1ZjQ3ZTExYWU4MmQzMzM1NGFh OGZhZGQzMDE4ZjE4Zjg4NCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMu bW0KQEAgLTQyOCw2ICs0MjgsNyBAQCBURVNUKFdlYktpdCwgV2Vic2l0ZURhdGFTdG9yZUVwaGVt ZXJhbCkKICAgICBoYW5kbGVyID0gbmlsOwogICAgIGNvbmZpZ3VyYXRpb24gPSBuaWw7CiAKKyAg ICBbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdOwogICAgIEVYUEVDVF9UUlVF KFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpkZWZhdWx0 UmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhdGgucGF0aF0pOwogICAgIEVYUEVDVF9GQUxTRShbW05T RmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6ZGVmYXVsdFJlc291 cmNlTG9hZFN0YXRpc3RpY3NGaWxlUGF0aC5wYXRoXSk7CiAKQEAgLTQ3MSw2ICs0NzIsNyBAQCBU RVNUKFdlYktpdCwgV2Vic2l0ZURhdGFTdG9yZUVwaGVtZXJhbFZpYUNvbmZpZ3VyYXRpb24pCiAg ICAgaGFuZGxlciA9IG5pbDsKICAgICBjb25maWd1cmF0aW9uID0gbmlsOwogCisgICAgW1dLV2Vi c2l0ZURhdGFTdG9yZSBkZWZhdWx0RGF0YVN0b3JlXTsKICAgICBFWFBFQ1RfVFJVRShbW05TRmls ZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6ZGVmYXVsdFJlc291cmNl TG9hZFN0YXRpc3RpY3NQYXRoLnBhdGhdKTsKICAgICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5h Z2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmRlZmF1bHRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRmlsZVBhdGgucGF0aF0pOwogCg==