199468 2019-07-03 15:25:57 -0700 Clarify threading model for WebResourceLoadStatisticsStore::dumpResourceLoadStatistics() 2019-07-04 14:43:53 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=196307 InRadar P2 Normal --- 196307 1 cdumez cdumez achristensen bfulgham commit-queue sihui_liu webkit-bug-importer wilander youennf oldest_to_newest 1550038 0 cdumez 2019-07-03 15:25:57 -0700 Clarify threading model for WebResourceLoadStatisticsStore::dumpResourceLoadStatistics() after r245517. 1550041 1 373422 cdumez 2019-07-03 15:29:45 -0700 Created attachment 373422 Patch 1550084 2 373422 youennf 2019-07-03 16:38:45 -0700 Comment on attachment 373422 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373422&action=review > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:76 > + void dumpResourceLoadStatistics(CompletionHandler<void(const String&)>&&) override; final > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h:82 > + void dumpResourceLoadStatistics(CompletionHandler<void(const String&)>&&) override; final 1550085 3 373434 cdumez 2019-07-03 16:41:09 -0700 Created attachment 373434 Patch 1550106 4 373434 commit-queue 2019-07-03 17:23:32 -0700 Comment on attachment 373434 Patch Clearing flags on attachment: 373434 Committed r247119: <https://trac.webkit.org/changeset/247119> 1550107 5 commit-queue 2019-07-03 17:23:33 -0700 All reviewed patches have been landed. Closing bug. 1550108 6 webkit-bug-importer 2019-07-03 17:24:15 -0700 <rdar://problem/52620712> 373422 2019-07-03 15:29:45 -0700 2019-07-03 16:41:08 -0700 Patch bug-199468-20190703152945.patch text/plain 13420 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdhMzkxOTA2MzMyY2RiMTNj MDFkY2NiMmJjYzhlYzhmY2JiY2MyNDIuLjk1NjJkMWE3NDhlYTk1NzcwY2VkYTM3ZWYxZmIwMjlj Y2FhMTQ3ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTktMDctMDMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGFyaWZ5IHRocmVhZGluZyBtb2Rl bCBmb3IgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpkdW1wUmVzb3VyY2VMb2FkU3Rh dGlzdGljcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTk0NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBPdXIgY29udmVudGlvbiBpcyB0aGF0IHRoZSBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUgaXMgYWx3YXlzIGNyZWF0ZWQsIHVzZWQgYW5kCisgICAgICAgIGRlc3Ryb3llZCBvbiB0aGUg bWFpbiB0aHJlYWQsIHdoaWxlIHRoZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUgaXMgYWx3 YXlzIGNyZWF0ZWQsCisgICAgICAgIHVzZWQgYW5kIGRlc3Ryb3llZCBvbiB0aGUgYmFja2dyb3Vu ZCBxdWV1ZS4KKworICAgICAgICByMjQ1NTE3IGJyb2tlIHRoaXMgY29udmVudGlvbiBieSBpbnRy b2R1Y2luZyBhIHRyeUR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkgbWV0aG9kCisgICAgICAg IHRvIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSB3aGljaCBnZXRzIGNhbGxlZCBvbiB0 aGUgYmFja2dyb3VuZCBxdWV1ZS4gVGhpcyBwYXRjaAorICAgICAgICBmaXhlcyB0aGlzIHNpbmNl IHRoaXMgaGFzIGJlZW4gYSBodWdlIHNvdXJjZSBvZiB0aHJlYWQtc2FmZXR5IGJ1Z3MgaW4gdGhl IHBhc3QuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VM b2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKToK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NEYXRhYmFzZVN0b3JlLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9S ZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NNZW1vcnlTdG9yZS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZW1vdmVEYXRhUmVjb3Jkcyk6CisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoK KyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpkYXRhUmVjb3Jk c0JlaW5nUmVtb3ZlZCBjb25zdCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZS5oOgorCiAyMDE5LTA3LTAzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgRml4IGEgY291cGxlIG9mIHRocmVhZCBzYWZldHkgaXNzdWVzIGlu IFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0 b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAKaW5kZXggM2MyZWNkNWJjOGNlNTg2OWY0 MGI2YzQzNmJiNWRkMTNlNjc0NzY1Zi4uMDQ5MjNlZTQzM2ZjMTJmNTZjMTI4ZjcwYWM3ODIzNjRl MzU2YmVhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lm aWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rh dGFiYXNlU3RvcmUuY3BwCkBAIC0xMDk5LDEzICsxMDk5LDEzIEBAIHZvaWQgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnNldERvbWFpbnNBc1ByZXZhbGVudChTdGRTZXQ8dW5z aWduZWQ+CiAgICAgfQogfQogCi1TdHJpbmcgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNl U3RvcmU6OmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkgY29uc3QKK3ZvaWQgUmVzb3VyY2VM b2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENv bXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgU3RyaW5nJik+JiYgY29tcGxldGlvbkhhbmRsZXIp CiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICAvLyBGSVhNRSgxOTUw ODgpOiBJbXBsZW1lbnQgU1FMaXRlLWJhc2VkIGR1bXBpbmcgcm91dGluZXMuCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIHsgfTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcih7 IH0pOwogfQogCiBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpwcmVk aWNhdGVWYWx1ZUZvckRvbWFpbihXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQmIHByZWRpY2F0ZVN0 YXRlbWVudCwgY29uc3QgUmVnaXN0cmFibGVEb21haW4mIGRvbWFpbikgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9D bGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgKaW5kZXggYmZj MjMzOTY4NTMzMjAwMjYyNjc4OTQzMWFlMDczYjJkMzk3NWY0My4uMWJhOTM0M2I2NDYwYzZkMDRl ODA2NWUzZDFiMTE4M2RhMTEwNzFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgKQEAgLTczLDcgKzczLDcgQEAgcHVibGljOgogICAg IGJvb2wgaXNSZWdpc3RlcmVkQXNSZWRpcmVjdGluZ1RvKGNvbnN0IFJlZGlyZWN0ZWRGcm9tRG9t YWluJiwgY29uc3QgUmVkaXJlY3RlZFRvRG9tYWluJikgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICB2 b2lkIGNsZWFyUHJldmFsZW50UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSBvdmVy cmlkZTsKLSAgICBTdHJpbmcgZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSBjb25zdCBvdmVy cmlkZTsKKyAgICB2b2lkIGR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoY29uc3QgU3RyaW5nJik+JiYpIG92ZXJyaWRlOwogICAgIGJvb2wgaXNQcmV2YWxl bnRSZXNvdXJjZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYpIGNvbnN0IG92ZXJyaWRlOwogICAg IGJvb2wgaXNWZXJ5UHJldmFsZW50UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSBj b25zdCBvdmVycmlkZTsKICAgICB2b2lkIHNldFByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lz dHJhYmxlRG9tYWluJikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNw cCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwCmluZGV4IDM1MjQxNzQ4ZGU0MzYxM2VmMDMwMjNiM2U2 NTc2MzU4YjZlZmZmYzQuLjczMDVjNTEwMjM2YTRjOGEzYTM2ZjYwNTA1Zjk2MTE4MmU0ZWU3MzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUu Y3BwCkBAIC00NjIsMTUgKzQ2MiwyMSBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1v cnlTdG9yZTo6c2V0UHJldmFsZW50UmVzb3VyY2UoUmVzb3VyY2VMb2FkU3RhdGlzdAogICAgIH0K IH0KICAgICAKLVN0cmluZyBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmR1bXBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkgY29uc3QKK3ZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c01lbW9yeVN0b3JlOjpkdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcyhDb21wbGV0aW9uSGFuZGxl cjx2b2lkKGNvbnN0IFN0cmluZyYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIEFTU0VS VCghUnVuTG9vcDo6aXNNYWluKCkpOworICAgIGlmIChkYXRhUmVjb3Jkc0JlaW5nUmVtb3ZlZCgp KSB7CisgICAgICAgIG1fZGF0YVJlY29yZFJlbW92YWxDb21wbGV0aW9uSGFuZGxlcnMuYXBwZW5k KFt0aGlzLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgp IG11dGFibGUgeworICAgICAgICAgICAgZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgICAgICB9KTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KIAogICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0OwogICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFs KCJSZXNvdXJjZSBsb2FkIHN0YXRpc3RpY3M6XG5cbiIpOwogICAgIGZvciAoYXV0byYgbWFwRW50 cnkgOiBtX3Jlc291cmNlU3RhdGlzdGljc01hcC52YWx1ZXMoKSkKICAgICAgICAgcmVzdWx0LmFw cGVuZChtYXBFbnRyeS50b1N0cmluZygpKTsKLSAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7 CisgICAgY29tcGxldGlvbkhhbmRsZXIocmVzdWx0LnRvU3RyaW5nKCkpOwogfQogCiBib29sIFJl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6aXNQcmV2YWxlbnRSZXNvdXJjZShjb25z dCBSZWdpc3RyYWJsZURvbWFpbiYgZG9tYWluKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1v cnlTdG9yZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291 cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5oCmluZGV4IDQ1ZjdlMWI3NTk2OTNjMTEwM2Ez ZDY2MjczMTZkNmZjZTAyZTRjZTkuLjVmZmVkMjU0NTQzMGM2ZmIzZThkODdjNzU5YjA2MjZlOGQx MDgwZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0 b3JlLmgKQEAgLTc5LDcgKzc5LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNSZWdpc3RlcmVkQXNS ZWRpcmVjdGluZ1RvKGNvbnN0IFJlZGlyZWN0ZWRGcm9tRG9tYWluJiwgY29uc3QgUmVkaXJlY3Rl ZFRvRG9tYWluJikgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICB2b2lkIGNsZWFyUHJldmFsZW50UmVz b3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSBvdmVycmlkZTsKLSAgICBTdHJpbmcgZHVt cFJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSBjb25zdCBvdmVycmlkZTsKKyAgICB2b2lkIGR1bXBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgU3RyaW5n Jik+JiYpIG92ZXJyaWRlOwogICAgIGJvb2wgaXNQcmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdp c3RyYWJsZURvbWFpbiYpIGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgaXNWZXJ5UHJldmFsZW50 UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSBjb25zdCBvdmVycmlkZTsKICAgICB2 b2lkIHNldFByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJikgb3ZlcnJp ZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIv UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IDc1 M2MyOTQzNzNiYzRiN2I4YzY5ODgzYzhjOWMxYjA4NWRlOTE0MjQuLjAwYjRmYTRkZmQ4YzdiYzhh MGM0MWU2ZGM4Y2E3ZTM5NzNjZmMwZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUuY3BwCkBAIC0yMTQsOCArMjE0LDEzIEBAIHZvaWQgUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpyZW1vdmVEYXRhUmVjb3JkcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgd2Vha1RoaXMtPmluY3JlbWVu dFJlY29yZHNEZWxldGVkQ291bnRGb3JEb21haW5zKFdURk1vdmUoZG9tYWluc1dpdGhEZWxldGVk V2Vic2l0ZURhdGEpKTsKICAgICAgICAgICAgICAgICB3ZWFrVGhpcy0+c2V0RGF0YVJlY29yZHNC ZWluZ1JlbW92ZWQoZmFsc2UpOwotICAgICAgICAgICAgICAgIHdlYWtUaGlzLT5tX3N0b3JlLnRy eUR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCk7CisgICAgICAgICAgICAgICAgCisgICAgICAg ICAgICAgICAgYXV0byBkYXRhUmVjb3JkUmVtb3ZhbENvbXBsZXRpb25IYW5kbGVycyA9IFdURk1v dmUod2Vha1RoaXMtPm1fZGF0YVJlY29yZFJlbW92YWxDb21wbGV0aW9uSGFuZGxlcnMpOwogICAg ICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgICAgICAgICAgICAgCisgICAg ICAgICAgICAgICAgZm9yIChhdXRvJiBkYXRhUmVjb3JkUmVtb3ZhbENvbXBsZXRpb25IYW5kbGVy IDogZGF0YVJlY29yZFJlbW92YWxDb21wbGV0aW9uSGFuZGxlcnMpCisgICAgICAgICAgICAgICAg ICAgIGRhdGFSZWNvcmRSZW1vdmFsQ29tcGxldGlvbkhhbmRsZXIoKTsKKwogICAgICAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0lORk9fSUYod2Vha1RoaXMtPm1fZGVidWdMb2dnaW5nRW5hYmxlZCwg SVRQRGVidWcsICJEb25lIHJlbW92aW5nIGRhdGEgcmVjb3Jkcy4iKTsKICAgICAgICAgICAgIH0p OwogICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Q2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaApp bmRleCBkNzc5OGIyNWQxZTNiYmJiNzhhODdhYjNlMWE1YTMxMzlmMTRiYTgyLi5hZGVjMTRjZjlj Y2Q5NjRjMjkwMWNlMmQ4NGVhMzU2ZGY2ZGIwZmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC0xMTksNyArMTE5LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgYm9vbCBpc1JlZ2lzdGVyZWRBc1JlZGlyZWN0aW5nVG8oY29uc3QgUmVkaXJlY3RlZEZyb21E b21haW4mLCBjb25zdCBSZWRpcmVjdGVkVG9Eb21haW4mKSBjb25zdCA9IDA7CiAKICAgICB2aXJ0 dWFsIHZvaWQgY2xlYXJQcmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYp ID0gMDsKLSAgICB2aXJ0dWFsIFN0cmluZyBkdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcygpIGNv bnN0ID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoQ29t cGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBTdHJpbmcmKT4mJikgPSAwOwogICAgIHZpcnR1YWwg Ym9vbCBpc1ByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJikgY29uc3Qg PSAwOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZlcnlQcmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdp c3RyYWJsZURvbWFpbiYpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UHJldmFsZW50 UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSA9IDA7CkBAIC0xODMsMTQgKzE4Mywx NCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzTWVtb3J5U3RvcmUoKSBjb25zdCB7IHJl dHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0RhdGFiYXNlU3RvcmUoKWNvbnN0IHsg cmV0dXJuIGZhbHNlOyB9CiAKLSAgICBib29sIGRhdGFSZWNvcmRzQmVpbmdSZW1vdmVkKCkgY29u c3QgeyByZXR1cm4gbV9kYXRhUmVjb3Jkc0JlaW5nUmVtb3ZlZDsgfQotCiBwcm90ZWN0ZWQ6CiAg ICAgc3RhdGljIHVuc2lnbmVkIGNvbXB1dGVJbXBvcnRhbmNlKGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlTG9hZFN0YXRpc3RpY3MmKTsKICAgICBzdGF0aWMgVmVjdG9yPE9wZXJhdGluZ0RhdGU+IG1l cmdlT3BlcmF0aW5nRGF0ZXMoY29uc3QgVmVjdG9yPE9wZXJhdGluZ0RhdGU+JiBleGlzdGluZ0Rh dGVzLCBWZWN0b3I8T3BlcmF0aW5nRGF0ZT4mJiBuZXdEYXRlcyk7CiAgICAgc3RhdGljIHZvaWQg ZGVidWdMb2dEb21haW5zSW5CYXRjaGVzKGNvbnN0IGNoYXIqIGFjdGlvbiwgY29uc3QgVmVjdG9y PFJlZ2lzdHJhYmxlRG9tYWluPiYgZG9tYWlucyk7CiAKICAgICBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUoV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlJiwgV29ya1F1ZXVlJiwgU2hv dWxkSW5jbHVkZUxvY2FsaG9zdCk7CisgICAgCisgICAgYm9vbCBkYXRhUmVjb3Jkc0JlaW5nUmVt b3ZlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YVJlY29yZHNCZWluZ1JlbW92ZWQ7IH0KIAogICAg IGJvb2wgaGFzU3RhdGlzdGljc0V4cGlyZWQoY29uc3QgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYs IE9wZXJhdGluZ0RhdGVzV2luZG93KSBjb25zdDsKICAgICBib29sIGhhc1N0YXRpc3RpY3NFeHBp cmVkKFdhbGxUaW1lIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lLCBPcGVyYXRpbmdEYXRl c1dpbmRvdykgY29uc3Q7CkBAIC0yMzQsNiArMjM0LDggQEAgcHJvdGVjdGVkOgogICAgIGJvb2wg ZGVidWdNb2RlRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGVidWdNb2RlRW5hYmxlZDsgfQog CiAgICAgc3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCBtYXhOdW1iZXJPZlJlY3Vyc2l2ZUNhbGxz SW5SZWRpcmVjdFRyYWNlQmFjayB7IDUwIH07CisgICAgCisgICAgVmVjdG9yPENvbXBsZXRpb25I YW5kbGVyPHZvaWQoKT4+IG1fZGF0YVJlY29yZFJlbW92YWxDb21wbGV0aW9uSGFuZGxlcnM7CiAK IHByaXZhdGU6CiAgICAgYm9vbCBzaG91bGRSZW1vdmVEYXRhUmVjb3JkcygpIGNvbnN0OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBiNzJk OGViYWIwYzRkMGI0M2U3M2JiNDIwNTNmMjQ0MDNlYTkwNjQyLi4yNmMyNWI5ZWNjODlmN2ZhMDUz YWIxYzBmZTAwNjM1MGExMTk2YjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlLmNwcApAQCAtNjI1LDI0ICs2MjUsMTYgQEAgdm9pZCBXZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRp b25IYW5kbGUKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCiAgICAgcG9zdFRhc2so W3RoaXMsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkg bXV0YWJsZSB7Ci0gICAgICAgIEFTU0VSVCghbV9kdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Nv bXBsZXRpb25IYW5kbGVyKTsKLSAgICAgICAgbV9kdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Nv bXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgICAgIGlm IChtX3N0YXRpc3RpY3NTdG9yZSAmJiBtX3N0YXRpc3RpY3NTdG9yZS0+ZGF0YVJlY29yZHNCZWlu Z1JlbW92ZWQoKSkKKyAgICAgICAgYXV0byBpbm5lckNvbXBsZXRpb25IYW5kbGVyID0gW2NvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKGNvbnN0IFN0cmluZyYg cmVzdWx0KSBtdXRhYmxlIHsKKyAgICAgICAgICAgIHBvc3RUYXNrUmVwbHkoW3Jlc3VsdCA9IHJl c3VsdC5pc29sYXRlZENvcHkoKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihyZXN1bHQpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH07CisgICAgICAgIGlmICghbV9z dGF0aXN0aWNzU3RvcmUpIHsKKyAgICAgICAgICAgIGlubmVyQ29tcGxldGlvbkhhbmRsZXIoZW1w dHlTdHJpbmcoKSk7CiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRyeUR1bXBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzKCk7Ci0gICAgfSk7Ci19Ci0KLXZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjp0cnlEdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcygpCi17Ci0gICAgQVNT RVJUKCFSdW5Mb29wOjppc01haW4oKSk7Ci0KLSAgICBpZiAoIW1fZHVtcFJlc291cmNlTG9hZFN0 YXRpc3RpY3NDb21wbGV0aW9uSGFuZGxlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU3RyaW5n IHJlc3VsdCA9IG1fc3RhdGlzdGljc1N0b3JlID8gbV9zdGF0aXN0aWNzU3RvcmUtPmR1bXBSZXNv dXJjZUxvYWRTdGF0aXN0aWNzKCkgOiBlbXB0eVN0cmluZygpOwotICAgIHBvc3RUYXNrUmVwbHko W3Jlc3VsdCA9IHJlc3VsdC5pc29sYXRlZENvcHkoKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZN b3ZlKG1fZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3NDb21wbGV0aW9uSGFuZGxlcildKCkgbXV0 YWJsZSB7Ci0gICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHJlc3VsdCk7CisgICAgICAgIH0KKyAg ICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKFdURk1v dmUoaW5uZXJDb21wbGV0aW9uSGFuZGxlcikpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIv V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKaW5kZXggZjE5YTczZDZmYmMyZWEyNThi Yzk5OGVhZDVkMjI3NWMyZmNhMDlhMS4uMWZjNDhhMmZiOTgzNTAzODI4YjhmNzRhNWIxOTliNmVl MjdkNDE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lm aWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu aApAQCAtMTI2LDcgKzEyNiw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFByZXZhbGVudFJlc291 cmNlKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYm KTsKICAgICB2b2lkIHNldFZlcnlQcmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdpc3RyYWJsZURv bWFpbiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBkdW1wUmVzb3Vy Y2VMb2FkU3RhdGlzdGljcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0cmluZyk+JiYpOwotICAg IHZvaWQgdHJ5RHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoKTsKICAgICB2b2lkIGlzUHJldmFs ZW50UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKGJvb2wpPiYmKTsKICAgICB2b2lkIGlzVmVyeVByZXZhbGVudFJlc291cmNlKGNvbnN0IFJl Z2lzdHJhYmxlRG9tYWluJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7CiAgICAg dm9pZCBpc1JlZ2lzdGVyZWRBc1N1YnJlc291cmNlVW5kZXIoY29uc3QgU3ViUmVzb3VyY2VEb21h aW4mLCBjb25zdCBUb3BGcmFtZURvbWFpbiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+ JiYpOwpAQCAtMjA2LDggKzIwNSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc1NjaGVkdWxl ZFByb2Nlc3NTdGF0cyB7IGZhbHNlIH07CiAKICAgICBib29sIG1fZmlyc3ROZXR3b3JrUHJvY2Vz c0NyZWF0ZWQgeyBmYWxzZSB9OwotICAgIAotICAgIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3Ry aW5nKT4gbV9kdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljc0NvbXBsZXRpb25IYW5kbGVyOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 373434 2019-07-03 16:41:09 -0700 2019-07-03 17:23:32 -0700 Patch bug-199468-20190703164109.patch text/plain 13413 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdhMzkxOTA2MzMyY2RiMTNj MDFkY2NiMmJjYzhlYzhmY2JiY2MyNDIuLjRkYjE4OTFiODZjOGRhNDIyMDE1MmEyZGFmNzA1MWY4 N2M5MTg5M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTktMDctMDMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGFyaWZ5IHRocmVhZGluZyBtb2Rl bCBmb3IgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpkdW1wUmVzb3VyY2VMb2FkU3Rh dGlzdGljcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTk0NjgKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAg IE91ciBjb252ZW50aW9uIGlzIHRoYXQgdGhlIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZSBpcyBhbHdheXMgY3JlYXRlZCwgdXNlZCBhbmQKKyAgICAgICAgZGVzdHJveWVkIG9uIHRoZSBt YWluIHRocmVhZCwgd2hpbGUgdGhlIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSBpcyBhbHdh eXMgY3JlYXRlZCwKKyAgICAgICAgdXNlZCBhbmQgZGVzdHJveWVkIG9uIHRoZSBiYWNrZ3JvdW5k IHF1ZXVlLgorCisgICAgICAgIHIyNDU1MTcgYnJva2UgdGhpcyBjb252ZW50aW9uIGJ5IGludHJv ZHVjaW5nIGEgdHJ5RHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSBtZXRob2QKKyAgICAgICAg dG8gV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlIHdoaWNoIGdldHMgY2FsbGVkIG9uIHRo ZSBiYWNrZ3JvdW5kIHF1ZXVlLiBUaGlzIHBhdGNoCisgICAgICAgIGZpeGVzIHRoaXMgc2luY2Ug dGhpcyBoYXMgYmVlbiBhIGh1Z2Ugc291cmNlIG9mIHRocmVhZC1zYWZldHkgYnVncyBpbiB0aGUg cGFzdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RhdGFiYXNlU3RvcmUuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6ZHVtcFJlc291cmNlTG9hZFN0YXRpc3Rp Y3MpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3Rh dGlzdGljc01lbW9yeVN0b3JlLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlbW92ZURhdGFSZWNvcmRzKToKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgor ICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRhdGFSZWNvcmRz QmVpbmdSZW1vdmVkIGNvbnN0KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3Mp OgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmg6CisKIDIwMTktMDctMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBGaXggYSBjb3VwbGUgb2YgdGhyZWFkIHNhZmV0eSBpc3N1ZXMgaW4g UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3Rv cmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAppbmRleCAzYzJlY2Q1YmM4Y2U1ODY5ZjQw YjZjNDM2YmI1ZGQxM2U2NzQ3NjVmLi4wNDkyM2VlNDMzZmMxMmY1NmMxMjhmNzBhYzc4MjM2NGUz NTZiZWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0 YWJhc2VTdG9yZS5jcHAKQEAgLTEwOTksMTMgKzEwOTksMTMgQEAgdm9pZCBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6c2V0RG9tYWluc0FzUHJldmFsZW50KFN0ZFNldDx1bnNp Z25lZD4KICAgICB9CiB9CiAKLVN0cmluZyBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VT dG9yZTo6ZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSBjb25zdAordm9pZCBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoQ29t cGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBTdHJpbmcmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikK IHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIC8vIEZJWE1FKDE5NTA4 OCk6IEltcGxlbWVudCBTUUxpdGUtYmFzZWQgZHVtcGluZyByb3V0aW5lcy4KICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4geyB9OworICAgIGNvbXBsZXRpb25IYW5kbGVyKHsg fSk7CiB9CiAKIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnByZWRp Y2F0ZVZhbHVlRm9yRG9tYWluKFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudCYgcHJlZGljYXRlU3Rh dGVtZW50LCBjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgZG9tYWluKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuaAppbmRleCBiZmMy MzM5Njg1MzMyMDAyNjI2Nzg5NDMxYWUwNzNiMmQzOTc1ZjQzLi4xMWQ3MzMzMzBhYzMyNjJkMzU2 MWM3M2NlNjc0N2RmY2I4ODU2OGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuaApAQCAtNzMsNyArNzMsNyBAQCBwdWJsaWM6CiAgICAg Ym9vbCBpc1JlZ2lzdGVyZWRBc1JlZGlyZWN0aW5nVG8oY29uc3QgUmVkaXJlY3RlZEZyb21Eb21h aW4mLCBjb25zdCBSZWRpcmVjdGVkVG9Eb21haW4mKSBjb25zdCBvdmVycmlkZTsKIAogICAgIHZv aWQgY2xlYXJQcmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYpIG92ZXJy aWRlOwotICAgIFN0cmluZyBkdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcygpIGNvbnN0IG92ZXJy aWRlOworICAgIHZvaWQgZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoQ29tcGxldGlvbkhhbmRs ZXI8dm9pZChjb25zdCBTdHJpbmcmKT4mJikgZmluYWw7CiAgICAgYm9vbCBpc1ByZXZhbGVudFJl c291cmNlKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgYm9v bCBpc1ZlcnlQcmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYpIGNvbnN0 IG92ZXJyaWRlOwogICAgIHZvaWQgc2V0UHJldmFsZW50UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFi bGVEb21haW4mKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3NNZW1vcnlTdG9yZS5jcHAKaW5kZXggMzUyNDE3NDhkZTQzNjEzZWYwMzAyM2IzZTY1NzYz NThiNmVmZmZjNC4uNzMwNWM1MTAyMzZhNGM4YTNhMzZmNjA1MDVmOTYxMTgyZTRlZTczNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNl TG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAK QEAgLTQ2MiwxNSArNDYyLDIxIEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0 b3JlOjpzZXRQcmV2YWxlbnRSZXNvdXJjZShSZXNvdXJjZUxvYWRTdGF0aXN0CiAgICAgfQogfQog ICAgIAotU3RyaW5nIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6ZHVtcFJlc291 cmNlTG9hZFN0YXRpc3RpY3MoKSBjb25zdAordm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVt b3J5U3RvcmU6OmR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgU3RyaW5nJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKCFS dW5Mb29wOjppc01haW4oKSk7CisgICAgaWYgKGRhdGFSZWNvcmRzQmVpbmdSZW1vdmVkKCkpIHsK KyAgICAgICAgbV9kYXRhUmVjb3JkUmVtb3ZhbENvbXBsZXRpb25IYW5kbGVycy5hcHBlbmQoW3Ro aXMsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0 YWJsZSB7CisgICAgICAgICAgICBkdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcyhXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7CisgICAgICAgIH0pOworICAgICAgICByZXR1cm47CisgICAgfQog CiAgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7CiAgICAgcmVzdWx0LmFwcGVuZExpdGVyYWwoIlJl c291cmNlIGxvYWQgc3RhdGlzdGljczpcblxuIik7CiAgICAgZm9yIChhdXRvJiBtYXBFbnRyeSA6 IG1fcmVzb3VyY2VTdGF0aXN0aWNzTWFwLnZhbHVlcygpKQogICAgICAgICByZXN1bHQuYXBwZW5k KG1hcEVudHJ5LnRvU3RyaW5nKCkpOwotICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsKKyAg ICBjb21wbGV0aW9uSGFuZGxlcihyZXN1bHQudG9TdHJpbmcoKSk7CiB9CiAKIGJvb2wgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjppc1ByZXZhbGVudFJlc291cmNlKGNvbnN0IFJl Z2lzdHJhYmxlRG9tYWluJiBkb21haW4pIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0 b3JlLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VM b2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmgKaW5kZXggNDVmN2UxYjc1OTY5M2MxMTAzYTNkNjYy NzMxNmQ2ZmNlMDJlNGNlOS4uNWFmNjdhMTZmMDYxNmRhOWZhMGMwOTMzMTVhY2JjMzVkYWE1YjEx OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUu aApAQCAtNzksNyArNzksNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1JlZ2lzdGVyZWRBc1JlZGly ZWN0aW5nVG8oY29uc3QgUmVkaXJlY3RlZEZyb21Eb21haW4mLCBjb25zdCBSZWRpcmVjdGVkVG9E b21haW4mKSBjb25zdCBvdmVycmlkZTsKIAogICAgIHZvaWQgY2xlYXJQcmV2YWxlbnRSZXNvdXJj ZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYpIG92ZXJyaWRlOwotICAgIFN0cmluZyBkdW1wUmVz b3VyY2VMb2FkU3RhdGlzdGljcygpIGNvbnN0IG92ZXJyaWRlOworICAgIHZvaWQgZHVtcFJlc291 cmNlTG9hZFN0YXRpc3RpY3MoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBTdHJpbmcmKT4m JikgZmluYWw7CiAgICAgYm9vbCBpc1ByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lzdHJhYmxl RG9tYWluJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgYm9vbCBpc1ZlcnlQcmV2YWxlbnRSZXNvdXJj ZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgc2V0 UHJldmFsZW50UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSBvdmVycmlkZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9D bGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggNzUzYzI5NDM3 M2JjNGI3YjhjNjk4ODNjOGM5YzFiMDg1ZGU5MTQyNC4uMDBiNGZhNGRmZDhjN2JjOGEwYzQxZTZk YzhjYTdlMzk3M2NmYzBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5jcHAKQEAgLTIxNCw4ICsyMTQsMTMgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnJlbW92ZURhdGFSZWNvcmRzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJgogICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB3ZWFrVGhpcy0+aW5jcmVtZW50UmVjb3Jk c0RlbGV0ZWRDb3VudEZvckRvbWFpbnMoV1RGTW92ZShkb21haW5zV2l0aERlbGV0ZWRXZWJzaXRl RGF0YSkpOwogICAgICAgICAgICAgICAgIHdlYWtUaGlzLT5zZXREYXRhUmVjb3Jkc0JlaW5nUmVt b3ZlZChmYWxzZSk7Ci0gICAgICAgICAgICAgICAgd2Vha1RoaXMtPm1fc3RvcmUudHJ5RHVtcFJl c291cmNlTG9hZFN0YXRpc3RpY3MoKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAg ICBhdXRvIGRhdGFSZWNvcmRSZW1vdmFsQ29tcGxldGlvbkhhbmRsZXJzID0gV1RGTW92ZSh3ZWFr VGhpcy0+bV9kYXRhUmVjb3JkUmVtb3ZhbENvbXBsZXRpb25IYW5kbGVycyk7CiAgICAgICAgICAg ICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAg ICAgICBmb3IgKGF1dG8mIGRhdGFSZWNvcmRSZW1vdmFsQ29tcGxldGlvbkhhbmRsZXIgOiBkYXRh UmVjb3JkUmVtb3ZhbENvbXBsZXRpb25IYW5kbGVycykKKyAgICAgICAgICAgICAgICAgICAgZGF0 YVJlY29yZFJlbW92YWxDb21wbGV0aW9uSGFuZGxlcigpOworCiAgICAgICAgICAgICAgICAgUkVM RUFTRV9MT0dfSU5GT19JRih3ZWFrVGhpcy0+bV9kZWJ1Z0xvZ2dpbmdFbmFibGVkLCBJVFBEZWJ1 ZywgIkRvbmUgcmVtb3ZpbmcgZGF0YSByZWNvcmRzLiIpOwogICAgICAgICAgICAgfSk7CiAgICAg ICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lm aWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmluZGV4IGQ3 Nzk4YjI1ZDFlM2JiYmI3OGE4N2FiM2UxYTVhMzEzOWYxNGJhODIuLmFkZWMxNGNmOWNjZDk2NGMy OTAxY2UyZDg0ZWEzNTZkZjZkYjBmZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmgKQEAgLTExOSw3ICsxMTksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IGlzUmVnaXN0ZXJlZEFzUmVkaXJlY3RpbmdUbyhjb25zdCBSZWRpcmVjdGVkRnJvbURvbWFpbiYs IGNvbnN0IFJlZGlyZWN0ZWRUb0RvbWFpbiYpIGNvbnN0ID0gMDsKIAogICAgIHZpcnR1YWwgdm9p ZCBjbGVhclByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJikgPSAwOwot ICAgIHZpcnR1YWwgU3RyaW5nIGR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkgY29uc3QgPSAw OworICAgIHZpcnR1YWwgdm9pZCBkdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcyhDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGNvbnN0IFN0cmluZyYpPiYmKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGlz UHJldmFsZW50UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSBjb25zdCA9IDA7CiAg ICAgdmlydHVhbCBib29sIGlzVmVyeVByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lzdHJhYmxl RG9tYWluJikgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQcmV2YWxlbnRSZXNvdXJj ZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYpID0gMDsKQEAgLTE4MywxNCArMTgzLDE0IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNNZW1vcnlTdG9yZSgpIGNvbnN0IHsgcmV0dXJuIGZh bHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzRGF0YWJhc2VTdG9yZSgpY29uc3QgeyByZXR1cm4g ZmFsc2U7IH0KIAotICAgIGJvb2wgZGF0YVJlY29yZHNCZWluZ1JlbW92ZWQoKSBjb25zdCB7IHJl dHVybiBtX2RhdGFSZWNvcmRzQmVpbmdSZW1vdmVkOyB9Ci0KIHByb3RlY3RlZDoKICAgICBzdGF0 aWMgdW5zaWduZWQgY29tcHV0ZUltcG9ydGFuY2UoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VMb2Fk U3RhdGlzdGljcyYpOwogICAgIHN0YXRpYyBWZWN0b3I8T3BlcmF0aW5nRGF0ZT4gbWVyZ2VPcGVy YXRpbmdEYXRlcyhjb25zdCBWZWN0b3I8T3BlcmF0aW5nRGF0ZT4mIGV4aXN0aW5nRGF0ZXMsIFZl Y3RvcjxPcGVyYXRpbmdEYXRlPiYmIG5ld0RhdGVzKTsKICAgICBzdGF0aWMgdm9pZCBkZWJ1Z0xv Z0RvbWFpbnNJbkJhdGNoZXMoY29uc3QgY2hhciogYWN0aW9uLCBjb25zdCBWZWN0b3I8UmVnaXN0 cmFibGVEb21haW4+JiBkb21haW5zKTsKIAogICAgIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZShXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUmLCBXb3JrUXVldWUmLCBTaG91bGRJbmNs dWRlTG9jYWxob3N0KTsKKyAgICAKKyAgICBib29sIGRhdGFSZWNvcmRzQmVpbmdSZW1vdmVkKCkg Y29uc3QgeyByZXR1cm4gbV9kYXRhUmVjb3Jkc0JlaW5nUmVtb3ZlZDsgfQogCiAgICAgYm9vbCBo YXNTdGF0aXN0aWNzRXhwaXJlZChjb25zdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiwgT3BlcmF0 aW5nRGF0ZXNXaW5kb3cpIGNvbnN0OwogICAgIGJvb2wgaGFzU3RhdGlzdGljc0V4cGlyZWQoV2Fs bFRpbWUgbW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUsIE9wZXJhdGluZ0RhdGVzV2luZG93 KSBjb25zdDsKQEAgLTIzNCw2ICsyMzQsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBkZWJ1Z01v ZGVFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9kZWJ1Z01vZGVFbmFibGVkOyB9CiAKICAgICBz dGF0aWMgY29uc3RleHByIHVuc2lnbmVkIG1heE51bWJlck9mUmVjdXJzaXZlQ2FsbHNJblJlZGly ZWN0VHJhY2VCYWNrIHsgNTAgfTsKKyAgICAKKyAgICBWZWN0b3I8Q29tcGxldGlvbkhhbmRsZXI8 dm9pZCgpPj4gbV9kYXRhUmVjb3JkUmVtb3ZhbENvbXBsZXRpb25IYW5kbGVyczsKIAogcHJpdmF0 ZToKICAgICBib29sIHNob3VsZFJlbW92ZURhdGFSZWNvcmRzKCkgY29uc3Q7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3Np Zmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IGI3MmQ4ZWJhYjBj NGQwYjQzZTczYmI0MjA1M2YyNDQwM2VhOTA2NDIuLjI2YzI1YjllY2M4OWY3ZmEwNTNhYjFjMGZl MDA2MzUwYTExOTZiMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Q2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwCkBAIC02MjUsMjQgKzYyNSwxNiBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6ZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoQ29tcGxldGlvbkhhbmRs ZQogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICBwb3N0VGFzayhbdGhpcywg Y29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxl IHsKLSAgICAgICAgQVNTRVJUKCFtX2R1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzQ29tcGxldGlv bkhhbmRsZXIpOwotICAgICAgICBtX2R1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzQ29tcGxldGlv bkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKTsKLSAgICAgICAgaWYgKG1fc3Rh dGlzdGljc1N0b3JlICYmIG1fc3RhdGlzdGljc1N0b3JlLT5kYXRhUmVjb3Jkc0JlaW5nUmVtb3Zl ZCgpKQorICAgICAgICBhdXRvIGlubmVyQ29tcGxldGlvbkhhbmRsZXIgPSBbY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oY29uc3QgU3RyaW5nJiByZXN1bHQp IG11dGFibGUgeworICAgICAgICAgICAgcG9zdFRhc2tSZXBseShbcmVzdWx0ID0gcmVzdWx0Lmlz b2xhdGVkQ29weSgpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpXSgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHJlc3Vs dCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfTsKKyAgICAgICAgaWYgKCFtX3N0YXRpc3Rp Y3NTdG9yZSkgeworICAgICAgICAgICAgaW5uZXJDb21wbGV0aW9uSGFuZGxlcihlbXB0eVN0cmlu ZygpKTsKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdHJ5RHVtcFJlc291cmNlTG9hZFN0 YXRpc3RpY3MoKTsKLSAgICB9KTsKLX0KLQotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnRyeUR1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkKLXsKLSAgICBBU1NFUlQoIVJ1 bkxvb3A6OmlzTWFpbigpKTsKLQotICAgIGlmICghbV9kdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGlj c0NvbXBsZXRpb25IYW5kbGVyKQotICAgICAgICByZXR1cm47Ci0KLSAgICBTdHJpbmcgcmVzdWx0 ID0gbV9zdGF0aXN0aWNzU3RvcmUgPyBtX3N0YXRpc3RpY3NTdG9yZS0+ZHVtcFJlc291cmNlTG9h ZFN0YXRpc3RpY3MoKSA6IGVtcHR5U3RyaW5nKCk7Ci0gICAgcG9zdFRhc2tSZXBseShbcmVzdWx0 ID0gcmVzdWx0Lmlzb2xhdGVkQ29weSgpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUobV9k dW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljc0NvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsK LSAgICAgICAgY29tcGxldGlvbkhhbmRsZXIocmVzdWx0KTsKKyAgICAgICAgfQorICAgICAgICBt X3N0YXRpc3RpY3NTdG9yZS0+ZHVtcFJlc291cmNlTG9hZFN0YXRpc3RpY3MoV1RGTW92ZShpbm5l ckNvbXBsZXRpb25IYW5kbGVyKSk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCBmMTlhNzNkNmZiYzJlYTI1OGJjOTk4ZWFk NWQyMjc1YzJmY2EwOWExLi4xZmM0OGEyZmI5ODM1MDM4MjhiOGY3NGE1YjE5OWI2ZWUyN2Q0MTY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC0x MjYsNyArMTI2LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0UHJldmFsZW50UmVzb3VyY2UoY29u c3QgUmVnaXN0cmFibGVEb21haW4mLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAg IHZvaWQgc2V0VmVyeVByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lkIGR1bXBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nKT4mJik7Ci0gICAgdm9pZCB0 cnlEdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcygpOwogICAgIHZvaWQgaXNQcmV2YWxlbnRSZXNv dXJjZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9v bCk+JiYpOwogICAgIHZvaWQgaXNWZXJ5UHJldmFsZW50UmVzb3VyY2UoY29uc3QgUmVnaXN0cmFi bGVEb21haW4mLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKICAgICB2b2lkIGlz UmVnaXN0ZXJlZEFzU3VicmVzb3VyY2VVbmRlcihjb25zdCBTdWJSZXNvdXJjZURvbWFpbiYsIGNv bnN0IFRvcEZyYW1lRG9tYWluJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7CkBA IC0yMDYsOCArMjA1LDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1faGFzU2NoZWR1bGVkUHJvY2Vz c1N0YXRzIHsgZmFsc2UgfTsKIAogICAgIGJvb2wgbV9maXJzdE5ldHdvcmtQcm9jZXNzQ3JlYXRl ZCB7IGZhbHNlIH07Ci0gICAgCi0gICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdHJpbmcpPiBt X2R1bXBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzQ29tcGxldGlvbkhhbmRsZXI7CiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQK