203491 2019-10-28 10:30:10 -0700 Layout Test http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html is a flaky failure 2019-10-28 14:38:35 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham cdumez commit-queue webkit-bug-importer wilander oldest_to_newest 1584482 0 katherine_cheney 2019-10-28 10:30:10 -0700 Previously fixed in <rdar://problem/51074251>. Started flaking again after fixing <rdar://problem/56314484>. 1584483 1 webkit-bug-importer 2019-10-28 10:31:12 -0700 <rdar://problem/56674176> 1584489 2 382081 katherine_cheney 2019-10-28 10:47:46 -0700 Created attachment 382081 Patch 1584492 3 382081 cdumez 2019-10-28 10:52:25 -0700 Comment on attachment 382081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382081&action=review > Source/WebKit/NetworkProcess/NetworkSession.cpp:181 > + if (!networkProcess().isITPDatabaseEnabled()) Instead of having these checks at call sites, could we maybe call populateMemoryStoreFromDisk() unconditionally and add a null check for the persistent store in populateMemoryStoreFromDisk()? 1584500 4 382084 katherine_cheney 2019-10-28 11:17:08 -0700 Created attachment 382084 Patch 1584587 5 katherine_cheney 2019-10-28 13:50:30 -0700 (In reply to Chris Dumez from comment #3) > Comment on attachment 382081 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382081&action=review > > > Source/WebKit/NetworkProcess/NetworkSession.cpp:181 > > + if (!networkProcess().isITPDatabaseEnabled()) > > Instead of having these checks at call sites, could we maybe call > populateMemoryStoreFromDisk() unconditionally and add a null check for the > persistent store in populateMemoryStoreFromDisk()? Thanks! Still waiting on commit privileges, can you cq+? 1584640 6 382084 commit-queue 2019-10-28 14:38:33 -0700 Comment on attachment 382084 Patch Clearing flags on attachment: 382084 Committed r251672: <https://trac.webkit.org/changeset/251672> 1584641 7 commit-queue 2019-10-28 14:38:35 -0700 All reviewed patches have been landed. Closing bug. 382081 2019-10-28 10:47:46 -0700 2019-10-28 11:17:06 -0700 Patch bug-203491-20191028104745.patch text/plain 10448 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3NzU4NGM5ZjRjYTEwMzQ2 NzhhY2U0OTA3Nzk2OTBjYjhhZGZiMWYuLmM2ZjM1NTE2MTdhY2I1ZGIzMGVlMGJlZWM2Y2MzNGYy YWRjMWEzYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTktMTAtMjggIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgTGF5b3V0IFRlc3Qg aHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3dlYnNpdGUtZGF0YS1yZW1vdmFsLWZv ci1zaXRlLW5hdmlnYXRlZC10by13aXRoLWxpbmstZGVjb3JhdGlvbi5odG1sIGlzIGEgZmxha3kg ZmFpbHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAzNDkxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NjY3NDE3Nj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgY2hh bmdlIGlzIHRlc3RlZCBieSB0aGUgZXhpc3RpbmcgcmVzb3VyY2VMb2FkU3RhdGlzdGljcworICAg ICAgICB0ZXN0cy4KKworICAgICAgICBUaGlzIHRlc3Qgc3RhcnRlZCBmbGFraW5nIHdoZW4gYSBu ZXcgbWVtb3J5IHN0b3JlIHdhcyBiZWluZyBjcmVhdGVkCisgICAgICAgIGJldHdlZW4gdGVzdHMg dG8gbWFpbnRhaW4gY29uc2lzdGVuY3kuIFRoZSBjYWxsIHRvIGdyYW5kZmF0aGVyRXhpc3RpbmdX ZWJzaXRlRGF0YQorICAgICAgICBmcm9tIHBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayBpbiB0 aGUgcGVyc2lzdGVudCBzdG9yYWdlIHdhcworICAgICAgICBhc3luYywgY2F1c2luZyBhIHJhY2Ug Y29uZGl0aW9uIHRoYXQgbGVkIHRvIG9jY2FzaW9uYWwgZmFpbHVyZXMuCisgICAgICAgIEFkZGlu ZyBhIGNvbXBsZXRpb24gaGFuZGxlciBhbmQgY2hhbmdpbmcgdGhlIGNhbGxzaXRlIG9mCisgICAg ICAgIHBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayBzaG91bGQgZml4IHRoaXMgcHJvYmxlbS4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlz dGljc1BlcnNpc3RlbnRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2Fk U3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lz dGVudFN0b3JhZ2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlLmg6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OldlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZSk6CisgICAgICAgIFRoZSBwZXJzaXN0ZW50IHN0b3JlIGluIHRo ZSBkYXRhYmFzZUVuYWJsZWQgY2FzZSB3YXMgbmV2ZXIgYmVpbmcgdXNlZAorICAgICAgICBhbmQg aXMgdW5uZWNlc3NhcnkuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpwb3B1bGF0ZU1lbW9yeVN0b3JlRnJvbURpc2spOgorICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmg6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUHJvY2Vzczo6c2V0VXNlSVRQRGF0YWJhc2UpOgorICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nl c3Npb246OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1Nlc3Npb246OnJlY3JlYXRlUmVzb3VyY2VMb2FkU3RhdGlzdGljU3RvcmUpOgor ICAgICAgICBTaW5jZSBwb3B1bGF0ZU1lbW9yeVN0b3JlRnJvbURpc2sgaXMgY2FsbGVkIG9uIHRo ZSBwZXJzaXN0ZW50IHN0b3JhZ2UKKyAgICAgICAgb2JqZWN0LCB3aGljaCBvbmx5IGV4aXN0cyBp ZiB1c2luZyB0aGUgbWVtb3J5IHN0b3JlLCBpdCBzaG91bGQgbm90CisgICAgICAgIGJlIGNhbGxl ZCBpZiB0aGUgc3RvcmUgaXMgdXNpbmcgdGhlIGRhdGFiYXNlCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDE5LTEwLTI4ICBDYXJsb3MgR2FyY2lhIENh bXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBTaW1wbGlmeSB0aGUg SW5wdXQgTWV0aG9kIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRT dG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lzdGVudFN0b3JhZ2UuY3BwCmluZGV4IDhhOWNhMjAzZTUw OTUzNGIwYTdiODM4ODMzYzkzMjQ3MWIxNTBhMzUuLmIzNjk2NjNjZjI3Zjk4ZTBkYjJhZWYwNmU4 ZmRiODNlYWY0ZDlmNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Q2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lzdGVudFN0b3JhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzUGVyc2lzdGVudFN0b3JhZ2UuY3BwCkBAIC02NCw3ICs2NCw2IEBAIFJlc291cmNl TG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1Bl cnNpc3RlbnRTdG9yYWdlCiAKICAgICBtX21lbW9yeVN0b3JlLnNldFBlcnNpc3RlbnRTdG9yYWdl KCp0aGlzKTsKIAotICAgIHBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzaygpOwogICAgIHN0YXJ0 TW9uaXRvcmluZ0Rpc2soKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFn ZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZS5oCmluZGV4IGYzZTgwN2RjNzc0MzQ0YTk1Zjli ZjA3MWQxMThjZmY0NTEyNDA3NTYuLjZjMzIyMGNkZmVlMDU3OWIyMjM3YTUzNTVmYTlkODAzNmRh ZTMwMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lzdGVudFN0b3JhZ2UuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1Bl cnNpc3RlbnRTdG9yYWdlLmgKQEAgLTU0LDYgKzU0LDcgQEAgcHVibGljOgogCiAgICAgZW51bSBj bGFzcyBGb3JjZUltbWVkaWF0ZVdyaXRlIHsgTm8sIFllcywgfTsKICAgICB2b2lkIHNjaGVkdWxl T3JXcml0ZU1lbW9yeVN0b3JlKEZvcmNlSW1tZWRpYXRlV3JpdGUpOworICAgIHZvaWQgcG9wdWxh dGVNZW1vcnlTdG9yZUZyb21EaXNrKCk7CiAKIHByaXZhdGU6CiAgICAgU3RyaW5nIHN0b3JhZ2VE aXJlY3RvcnlQYXRoSXNvbGF0ZWRDb3B5KCkgY29uc3Q7CkBAIC02NCw3ICs2NSw2IEBAIHByaXZh dGU6CiAgICAgdm9pZCBtb25pdG9yRGlyZWN0b3J5Rm9yTmV3U3RhdGlzdGljcygpOwogCiAgICAg dm9pZCB3cml0ZU1lbW9yeVN0b3JlVG9EaXNrKCk7Ci0gICAgdm9pZCBwb3B1bGF0ZU1lbW9yeVN0 b3JlRnJvbURpc2soKTsKICAgICB2b2lkIGV4Y2x1ZGVGcm9tQmFja3VwKCkgY29uc3Q7CiAgICAg dm9pZCByZWZyZXNoTWVtb3J5U3RvcmVGcm9tRGlzaygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IGU5ZDA4ZWU5NWU3NDE0YmM5ZjM0 YzQyNWQzOGQ1OThkZWM3M2ZjYmIuLmExMDEyZGEzMTI4M2Q5MWIwMjI4NjdjNDNlMDgyNGQwMjQ5 ZDBkMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu Y3BwCkBAIC0xNjIsOCArMTYyLDYgQEAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUoTmV0d29ya1Nlc3Npb24mIG4KICAgICAgICAg ICAgIG1fc3RhdGlzdGljc1N0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZT4oKnRoaXMsIG1fc3RhdGlzdGljc1F1ZXVlLCBzaG91bGRJbmNsdWRlTG9j YWxob3N0LCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCBzZXNzaW9uSUQpOwogCiAg ICAgICAgICAgICBhdXRvIG1lbW9yeVN0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzTWVtb3J5U3RvcmU+KCp0aGlzLCBtX3N0YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5jbHVk ZUxvY2FsaG9zdCk7Ci0gICAgICAgICAgICBhdXRvIHBlcnNpc3RlbnRTdG9yZSA9IG1ha2VVbmlx dWU8UmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlPigqbWVtb3J5U3RvcmUs IG1fc3RhdGlzdGljc1F1ZXVlLCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KTsKLQog ICAgICAgICAgICAgZG93bmNhc3Q8UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU+ KCptX3N0YXRpc3RpY3NTdG9yZS5nZXQoKSkucG9wdWxhdGVGcm9tTWVtb3J5U3RvcmUoKm1lbW9y eVN0b3JlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3Jl ID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU+KCp0aGlzLCBt X3N0YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5jbHVkZUxvY2FsaG9zdCk7CkBAIC0yMjMsNiArMjIx LDE2IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpmbHVzaEFuZERlc3Ry b3lQZXJzaXN0ZW50U3RvcmUoKQogICAgIHNlbWFwaG9yZS53YWl0KCk7CiB9CiAKK3ZvaWQgV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwb3B1bGF0ZU1lbW9yeVN0b3JlRnJvbURpc2so Q29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIEFT U0VSVChSdW5Mb29wOjppc01haW4oKSk7CisKKyAgICBwb3N0VGFzayhbdGhpcywgY29tcGxldGlv bkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAg ICAgbV9wZXJzaXN0ZW50U3RvcmFnZS0+cG9wdWxhdGVNZW1vcnlTdG9yZUZyb21EaXNrKCk7Cisg ICAgICAgIHBvc3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIH0p OworfQorCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0UmVzb3VyY2VM b2FkU3RhdGlzdGljc0RlYnVnTW9kZShib29sIHZhbHVlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCA0 MGFmZGI4ZTQ1ZGVkOTZjY2M2OTRiMzY3N2NmODI4MjNjYWM1ZDM1Li44ZGI3YjFjNTcxOGFhNWU0 NjlmMTkzZTZmYjU5OTJlMTMwNWYzY2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC0xMDYsNiArMTA2LDcgQEAgcHVibGljOgogCiAgICAgV1RG OjpXb3JrUXVldWUmIHN0YXRpc3RpY3NRdWV1ZSgpIHsgcmV0dXJuIG1fc3RhdGlzdGljc1F1ZXVl LmdldCgpOyB9CiAKKyAgICB2b2lkIHBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayhDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgc2V0Tm90aWZ5UGFnZXNXaGVuRGF0YVJl Y29yZHNXZXJlU2Nhbm5lZChib29sKTsKICAgICB2b2lkIHNldE5vdGlmeVBhZ2VzV2hlblRlbGVt ZXRyeVdhc0NhcHR1cmVkKGJvb2wsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAg dm9pZCBzZXRTaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbChi b29sLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCAxMGJjMWRiYmM1ZWVhN2ZhNmZj YjBmYTNiYjFmYTU3ZDVkODE5ZjBjLi45ZDljMzgyZmRjYWE0NTQ1NjllY2U4OWExN2NiZmZjYmQz NmUwNjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmNwcApAQCAtNjY4LDkgKzY2OCw5IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldFVzZUlU UERhdGFiYXNlKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgYm9vbCB2YWx1ZSwgQ29tCiAgICAg aWYgKGF1dG8qIG5ldHdvcmtTZXNzaW9uID0gdGhpcy0+bmV0d29ya1Nlc3Npb24oc2Vzc2lvbklE KSkgewogICAgICAgICBpZiAobV9pc0lUUERhdGFiYXNlRW5hYmxlZCAhPSB2YWx1ZSkgewogICAg ICAgICAgICAgbV9pc0lUUERhdGFiYXNlRW5hYmxlZCA9IHZhbHVlOwotICAgICAgICAgICAgbmV0 d29ya1Nlc3Npb24tPnJlY3JlYXRlUmVzb3VyY2VMb2FkU3RhdGlzdGljU3RvcmUoKTsKLSAgICAg ICAgfQotICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgICAgICAgICAgbmV0d29ya1Nl c3Npb24tPnJlY3JlYXRlUmVzb3VyY2VMb2FkU3RhdGlzdGljU3RvcmUoV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcikpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Nlc3Npb24uY3BwCmluZGV4IDExMmNkMmJiNWVhMDA1YzU5MzZiYzlhNjM0NDQ1 NzU1ZWZiNzdiMzQuLjZmMzA3YzIzMDFmZmEwNWM4OWQyNjAzOTRiYjM1OTM1NTBiNjA1MGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCkBA IC0xNjQsNiArMTY0LDggQEAgdm9pZCBOZXR3b3JrU2Vzc2lvbjo6c2V0UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0VuYWJsZWQoYm9vbCBlbmFibGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fcmVz b3VyY2VMb2FkU3RhdGlzdGljcyA9IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y3Jl YXRlKCp0aGlzLCBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnksIG1fc2hvdWxkSW5j bHVkZUxvY2FsaG9zdEluUmVzb3VyY2VMb2FkU3RhdGlzdGljcyk7CisgICAgaWYgKCFuZXR3b3Jr UHJvY2VzcygpLmlzSVRQRGF0YWJhc2VFbmFibGVkKCkpCisgICAgICAgIG1fcmVzb3VyY2VMb2Fk U3RhdGlzdGljcy0+cG9wdWxhdGVNZW1vcnlTdG9yZUZyb21EaXNrKFtdIHsgfSk7CiAKICAgICBp ZiAobV9lbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlID09IEVuYWJsZVJlc291 cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGU6OlllcykKICAgICAgICAgbV9yZXNvdXJjZUxvYWRT dGF0aXN0aWNzLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKHRydWUsIFtdIHsg fSk7CkBAIC0xNzIsMTAgKzE3NCwxNCBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uOjpzZXRSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsZSkKICAgICAgICAgbV9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzLT5zZXRQcmV2YWxlbnRSZXNvdXJjZUZvckRlYnVnTW9kZShtX3Jlc291cmNl TG9hZFN0YXRpc3RpY3NNYW51YWxQcmV2YWxlbnRSZXNvdXJjZSwgW10geyB9KTsKIH0KIAotdm9p ZCBOZXR3b3JrU2Vzc2lvbjo6cmVjcmVhdGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNTdG9yZSgpCit2 b2lkIE5ldHdvcmtTZXNzaW9uOjpyZWNyZWF0ZVJlc291cmNlTG9hZFN0YXRpc3RpY1N0b3JlKENv bXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBkZXN0 cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljcygpOwogICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGlj cyA9IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y3JlYXRlKCp0aGlzLCBtX3Jlc291 cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnksIG1fc2hvdWxkSW5jbHVkZUxvY2FsaG9zdEluUmVz b3VyY2VMb2FkU3RhdGlzdGljcyk7CisgICAgaWYgKCFuZXR3b3JrUHJvY2VzcygpLmlzSVRQRGF0 YWJhc2VFbmFibGVkKCkpCisgICAgICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+cG9wdWxh dGVNZW1vcnlTdG9yZUZyb21EaXNrKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBl bHNlCisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiB9CiAKIGJvb2wgTmV0d29ya1Nlc3Np b246OmlzUmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCmluZGV4IGFhNDQwNTg3OGYwNDEx MmVhNmE2YTA1ZDI5YWFkNzgwZWU0NzAyM2IuLmNmNzRiYTRiNTczODllN2U1NzdlNGRlMTU5YWNi YTEwZjgxM2M2OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtT ZXNzaW9uLmgKQEAgLTg0LDcgKzg0LDcgQEAgcHVibGljOgogI2lmIEVOQUJMRShSRVNPVVJDRV9M T0FEX1NUQVRJU1RJQ1MpCiAgICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKiByZXNv dXJjZUxvYWRTdGF0aXN0aWNzKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzLmdldCgpOyB9CiAgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChi b29sKTsKLSAgICB2b2lkIHJlY3JlYXRlUmVzb3VyY2VMb2FkU3RhdGlzdGljU3RvcmUoKTsKKyAg ICB2b2lkIHJlY3JlYXRlUmVzb3VyY2VMb2FkU3RhdGlzdGljU3RvcmUoQ29tcGxldGlvbkhhbmRs ZXI8dm9pZCgpPiYmKTsKICAgICBib29sIGlzUmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQo KSBjb25zdDsKICAgICB2b2lkIG5vdGlmeVJlc291cmNlTG9hZFN0YXRpc3RpY3NQcm9jZXNzZWQo KTsKICAgICB2b2lkIGRlbGV0ZVdlYnNpdGVEYXRhRm9yUmVnaXN0cmFibGVEb21haW5zKE9wdGlv blNldDxXZWJzaXRlRGF0YVR5cGU+LCBWZWN0b3I8c3RkOjpwYWlyPFdlYkNvcmU6OlJlZ2lzdHJh YmxlRG9tYWluLCBXZWJzaXRlRGF0YVRvUmVtb3ZlPj4mJiwgYm9vbCBzaG91bGROb3RpZnlQYWdl LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IEhhc2hTZXQ8V2ViQ29yZTo6UmVnaXN0cmFi bGVEb21haW4+Jik+JiYpOwo= 382084 2019-10-28 11:17:08 -0700 2019-10-28 14:38:33 -0700 Patch bug-203491-20191028111707.patch text/plain 10312 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3NzU4NGM5ZjRjYTEwMzQ2 NzhhY2U0OTA3Nzk2OTBjYjhhZGZiMWYuLjJhOWUxNTM3OGNlOTA1Mjk5MDFhMTkyZDc1N2FmOGQ5 YWEzOGUwNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTktMTAtMjggIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgTGF5b3V0IFRlc3Qg aHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3dlYnNpdGUtZGF0YS1yZW1vdmFsLWZv ci1zaXRlLW5hdmlnYXRlZC10by13aXRoLWxpbmstZGVjb3JhdGlvbi5odG1sIGlzIGEgZmxha3kg ZmFpbHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAzNDkxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NjY3NDE3Nj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgY2hh bmdlIGlzIHRlc3RlZCBieSB0aGUgZXhpc3RpbmcgcmVzb3VyY2VMb2FkU3RhdGlzdGljcworICAg ICAgICB0ZXN0cy4KKworICAgICAgICBUaGlzIHRlc3Qgc3RhcnRlZCBmbGFraW5nIHdoZW4gYSBu ZXcgbWVtb3J5IHN0b3JlIHdhcyBiZWluZyBjcmVhdGVkCisgICAgICAgIGJldHdlZW4gdGVzdHMg dG8gbWFpbnRhaW4gY29uc2lzdGVuY3kuIFRoZSBjYWxsIHRvIGdyYW5kZmF0aGVyRXhpc3RpbmdX ZWJzaXRlRGF0YQorICAgICAgICBmcm9tIHBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayBpbiB0 aGUgcGVyc2lzdGVudCBzdG9yYWdlIHdhcworICAgICAgICBhc3luYywgY2F1c2luZyBhIHJhY2Ug Y29uZGl0aW9uIHRoYXQgbGVkIHRvIG9jY2FzaW9uYWwgZmFpbHVyZXMuCisgICAgICAgIEFkZGlu ZyBhIGNvbXBsZXRpb24gaGFuZGxlciBhbmQgY2hhbmdpbmcgdGhlIGNhbGxzaXRlIG9mCisgICAg ICAgIHBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayBzaG91bGQgZml4IHRoaXMgcHJvYmxlbS4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlz dGljc1BlcnNpc3RlbnRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2Fk U3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lz dGVudFN0b3JhZ2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlLmg6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OldlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZSk6CisgICAgICAgIFRoZSBwZXJzaXN0ZW50IHN0b3JlIGluIHRo ZSBkYXRhYmFzZUVuYWJsZWQgY2FzZSB3YXMgbmV2ZXIgYmVpbmcgdXNlZAorICAgICAgICBhbmQg aXMgdW5uZWNlc3NhcnkuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpwb3B1bGF0ZU1lbW9yeVN0b3JlRnJvbURpc2spOgorICAgICAgICBTaW5jZSBw ZXJzaXN0ZW50IHN0b3JhZ2Ugb25seSBleGlzdHMgd2hlbiB1c2luZyB0aGUgbWVtb3J5IHN0b3Jl LAorICAgICAgICBwb3B1bGF0ZU1lbW9yeVN0b3JlRnJvbURpc2sgc2hvdWxkIGNoZWNrIGlmCisg ICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UgaGFzIGJlZW4gaW5pdGlhbGl6ZWQuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnNldFVzZUlUUERhdGFiYXNlKToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtTZXNzaW9uOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjpyZWNyZWF0ZVJlc291cmNlTG9hZFN0YXRpc3Rp Y1N0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorCiAy MDE5LTEwLTI4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXSBTaW1wbGlmeSB0aGUgSW5wdXQgTWV0aG9kIGltcGxlbWVudGF0aW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lzdGVudFN0 b3JhZ2UuY3BwCmluZGV4IDhhOWNhMjAzZTUwOTUzNGIwYTdiODM4ODMzYzkzMjQ3MWIxNTBhMzUu LmIzNjk2NjNjZjI3Zjk4ZTBkYjJhZWYwNmU4ZmRiODNlYWY0ZDlmNDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzUGVyc2lzdGVudFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lzdGVudFN0b3JhZ2UuY3Bw CkBAIC02NCw3ICs2NCw2IEBAIFJlc291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFn ZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlCiAKICAgICBtX21lbW9y eVN0b3JlLnNldFBlcnNpc3RlbnRTdG9yYWdlKCp0aGlzKTsKIAotICAgIHBvcHVsYXRlTWVtb3J5 U3RvcmVGcm9tRGlzaygpOwogICAgIHN0YXJ0TW9uaXRvcmluZ0Rpc2soKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZS5o CmluZGV4IGYzZTgwN2RjNzc0MzQ0YTk1ZjliZjA3MWQxMThjZmY0NTEyNDA3NTYuLjZjMzIyMGNk ZmVlMDU3OWIyMjM3YTUzNTVmYTlkODAzNmRhZTMwMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lz dGVudFN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlLmgKQEAgLTU0LDYgKzU0 LDcgQEAgcHVibGljOgogCiAgICAgZW51bSBjbGFzcyBGb3JjZUltbWVkaWF0ZVdyaXRlIHsgTm8s IFllcywgfTsKICAgICB2b2lkIHNjaGVkdWxlT3JXcml0ZU1lbW9yeVN0b3JlKEZvcmNlSW1tZWRp YXRlV3JpdGUpOworICAgIHZvaWQgcG9wdWxhdGVNZW1vcnlTdG9yZUZyb21EaXNrKCk7CiAKIHBy aXZhdGU6CiAgICAgU3RyaW5nIHN0b3JhZ2VEaXJlY3RvcnlQYXRoSXNvbGF0ZWRDb3B5KCkgY29u c3Q7CkBAIC02NCw3ICs2NSw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBtb25pdG9yRGlyZWN0b3J5 Rm9yTmV3U3RhdGlzdGljcygpOwogCiAgICAgdm9pZCB3cml0ZU1lbW9yeVN0b3JlVG9EaXNrKCk7 Ci0gICAgdm9pZCBwb3B1bGF0ZU1lbW9yeVN0b3JlRnJvbURpc2soKTsKICAgICB2b2lkIGV4Y2x1 ZGVGcm9tQmFja3VwKCkgY29uc3Q7CiAgICAgdm9pZCByZWZyZXNoTWVtb3J5U3RvcmVGcm9tRGlz aygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3Bw CmluZGV4IGU5ZDA4ZWU5NWU3NDE0YmM5ZjM0YzQyNWQzOGQ1OThkZWM3M2ZjYmIuLmQ4NGIxYzQx YTA3NDUyNDZlNTZhZWI2ZjIzMzhhZjc3Njk2OTkwNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC0xNjIsOCArMTYyLDYgQEAgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUo TmV0d29ya1Nlc3Npb24mIG4KICAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlID0gbWFrZVVu aXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZT4oKnRoaXMsIG1fc3RhdGlz dGljc1F1ZXVlLCBzaG91bGRJbmNsdWRlTG9jYWxob3N0LCByZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGlyZWN0b3J5LCBzZXNzaW9uSUQpOwogCiAgICAgICAgICAgICBhdXRvIG1lbW9yeVN0b3JlID0g bWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU+KCp0aGlzLCBtX3N0 YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5jbHVkZUxvY2FsaG9zdCk7Ci0gICAgICAgICAgICBhdXRv IHBlcnNpc3RlbnRTdG9yZSA9IG1ha2VVbmlxdWU8UmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNp c3RlbnRTdG9yYWdlPigqbWVtb3J5U3RvcmUsIG1fc3RhdGlzdGljc1F1ZXVlLCByZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGlyZWN0b3J5KTsKLQogICAgICAgICAgICAgZG93bmNhc3Q8UmVzb3VyY2VM b2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU+KCptX3N0YXRpc3RpY3NTdG9yZS5nZXQoKSkucG9w dWxhdGVGcm9tTWVtb3J5U3RvcmUoKm1lbW9yeVN0b3JlKTsKICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzTWVtb3J5U3RvcmU+KCp0aGlzLCBtX3N0YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5jbHVk ZUxvY2FsaG9zdCk7CkBAIC0yMjMsNiArMjIxLDE4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoKQogICAgIHNlbWFw aG9yZS53YWl0KCk7CiB9CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpw b3B1bGF0ZU1lbW9yeVN0b3JlRnJvbURpc2soQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNv bXBsZXRpb25IYW5kbGVyKQoreworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisgICAg CisgICAgcG9zdFRhc2soW3RoaXMsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CisgICAgICAgIGlmIChtX3BlcnNpc3RlbnRTdG9yYWdl KQorICAgICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFnZS0+cG9wdWxhdGVNZW1vcnlTdG9yZUZy b21EaXNrKCk7CisKKyAgICAgICAgcG9zdFRhc2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSk7CisgICAgfSk7Cit9CisKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKGJvb2wgdmFsdWUsIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBBU1NFUlQoUnVu TG9vcDo6aXNNYWluKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oCmluZGV4IDQwYWZkYjhlNDVkZWQ5NmNjYzY5NGIzNjc3Y2Y4MjgyM2NhYzVkMzUuLjhk YjdiMWM1NzE4YWE1ZTQ2OWYxOTNlNmZiNTk5MmUxMzA1ZjNjZjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIv V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTEwNiw2ICsxMDYsNyBAQCBwdWJs aWM6CiAKICAgICBXVEY6OldvcmtRdWV1ZSYgc3RhdGlzdGljc1F1ZXVlKCkgeyByZXR1cm4gbV9z dGF0aXN0aWNzUXVldWUuZ2V0KCk7IH0KIAorICAgIHZvaWQgcG9wdWxhdGVNZW1vcnlTdG9yZUZy b21EaXNrKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBzZXROb3RpZnlQ YWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkKGJvb2wpOwogICAgIHZvaWQgc2V0Tm90aWZ5 UGFnZXNXaGVuVGVsZW1ldHJ5V2FzQ2FwdHVyZWQoYm9vbCwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZCgpPiYmKTsKICAgICB2b2lkIHNldFNob3VsZENsYXNzaWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJl Y29yZHNSZW1vdmFsKGJvb2wsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IDEwYmMx ZGJiYzVlZWE3ZmE2ZmNiMGZhM2JiMWZhNTdkNWQ4MTlmMGMuLjlkOWMzODJmZGNhYTQ1NDU2OWVj ZTg5YTE3Y2JmZmNiZDM2ZTA2NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC02NjgsOSArNjY4LDkgQEAgdm9pZCBOZXR3b3JrUHJv Y2Vzczo6c2V0VXNlSVRQRGF0YWJhc2UoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBib29sIHZh bHVlLCBDb20KICAgICBpZiAoYXV0byogbmV0d29ya1Nlc3Npb24gPSB0aGlzLT5uZXR3b3JrU2Vz c2lvbihzZXNzaW9uSUQpKSB7CiAgICAgICAgIGlmIChtX2lzSVRQRGF0YWJhc2VFbmFibGVkICE9 IHZhbHVlKSB7CiAgICAgICAgICAgICBtX2lzSVRQRGF0YWJhc2VFbmFibGVkID0gdmFsdWU7Ci0g ICAgICAgICAgICBuZXR3b3JrU2Vzc2lvbi0+cmVjcmVhdGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNT dG9yZSgpOwotICAgICAgICB9Ci0gICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgICAg ICAgICBuZXR3b3JrU2Vzc2lvbi0+cmVjcmVhdGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNTdG9yZShX VEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAg Y29tcGxldGlvbkhhbmRsZXIoKTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAKaW5kZXggMTEyY2QyYmI1ZWEwMDVj NTkzNmJjOWE2MzQ0NDU3NTVlZmI3N2IzNC4uNmU0MjRlYzFiMzY2MGRiN2VlZWRlMzFjNWQyNzA3 YTlmZDRhMDhjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U2Vzc2lvbi5jcHAKQEAgLTE2NCw2ICsxNjQsNyBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uOjpzZXRS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsZSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpjcmVhdGUoKnRoaXMsIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9y eSwgbV9zaG91bGRJbmNsdWRlTG9jYWxob3N0SW5SZXNvdXJjZUxvYWRTdGF0aXN0aWNzKTsKKyAg ICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MtPnBvcHVsYXRlTWVtb3J5U3RvcmVGcm9tRGlzayhb XSB7IH0pOwogCiAgICAgaWYgKG1fZW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9k ZSA9PSBFbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOjpZZXMpCiAgICAgICAg IG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVn TW9kZSh0cnVlLCBbXSB7IH0pOwpAQCAtMTcyLDEwICsxNzMsMTEgQEAgdm9pZCBOZXR3b3JrU2Vz c2lvbjo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCBlbmFibGUpCiAgICAg ICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+c2V0UHJldmFsZW50UmVzb3VyY2VGb3JEZWJ1 Z01vZGUobV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFudWFsUHJldmFsZW50UmVzb3VyY2UsIFtd IHsgfSk7CiB9CiAKLXZvaWQgTmV0d29ya1Nlc3Npb246OnJlY3JlYXRlUmVzb3VyY2VMb2FkU3Rh dGlzdGljU3RvcmUoKQordm9pZCBOZXR3b3JrU2Vzc2lvbjo6cmVjcmVhdGVSZXNvdXJjZUxvYWRT dGF0aXN0aWNTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRs ZXIpCiB7CiAgICAgZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3MoKTsKICAgICBtX3Jlc291 cmNlTG9hZFN0YXRpc3RpY3MgPSBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNyZWF0 ZSgqdGhpcywgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCBtX3Nob3VsZEluY2x1 ZGVMb2NhbGhvc3RJblJlc291cmNlTG9hZFN0YXRpc3RpY3MpOworICAgIG1fcmVzb3VyY2VMb2Fk U3RhdGlzdGljcy0+cG9wdWxhdGVNZW1vcnlTdG9yZUZyb21EaXNrKFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpKTsKIH0KIAogYm9vbCBOZXR3b3JrU2Vzc2lvbjo6aXNSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRW5hYmxlZCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtTZXNzaW9uLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtTZXNzaW9uLmgKaW5kZXggYWE0NDA1ODc4ZjA0MTEyZWE2YTZhMDVkMjlhYWQ3ODBlZTQ3 MDIzYi4uY2Y3NGJhNGI1NzM4OWU3ZTU3N2U0ZGUxNTlhY2JhMTBmODEzYzY4YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaApAQCAtODQsNyArODQs NyBAQCBwdWJsaWM6CiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKICAgICBX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUqIHJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSBj b25zdCB7IHJldHVybiBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MuZ2V0KCk7IH0KICAgICB2b2lk IHNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGJvb2wpOwotICAgIHZvaWQgcmVjcmVh dGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNTdG9yZSgpOworICAgIHZvaWQgcmVjcmVhdGVSZXNvdXJj ZUxvYWRTdGF0aXN0aWNTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIGJv b2wgaXNSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCgpIGNvbnN0OwogICAgIHZvaWQgbm90 aWZ5UmVzb3VyY2VMb2FkU3RhdGlzdGljc1Byb2Nlc3NlZCgpOwogICAgIHZvaWQgZGVsZXRlV2Vi c2l0ZURhdGFGb3JSZWdpc3RyYWJsZURvbWFpbnMoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4s IFZlY3RvcjxzdGQ6OnBhaXI8V2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4sIFdlYnNpdGVEYXRh VG9SZW1vdmU+PiYmLCBib29sIHNob3VsZE5vdGlmeVBhZ2UsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgSGFzaFNldDxXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbj4mKT4mJik7Cg==