178527 2017-10-19 11:55:09 -0700 Service Worker process should not be selected to open WebView on it 2017-11-15 13:02:40 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 178475 1 youennf youennf beidson cdumez commit-queue dbates webkit-bug-importer oldest_to_newest 1362233 0 youennf 2017-10-19 11:55:09 -0700 Currently service worker process is a web process. In the future, we might want it to have a dedicated type. In the meantime, it should not be selected to open WebView on it 1362237 1 324256 youennf 2017-10-19 11:57:49 -0700 Created attachment 324256 Patch 1362253 2 324256 cdumez 2017-10-19 12:21:52 -0700 Comment on attachment 324256 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=324256&action=review r=me with comments. > Source/WebKit/UIProcess/WebProcessPool.cpp:940 > + Vector<std::reference_wrapper<WebProcessProxy>> processes; I think processes is too generic, how about reusableProcesses ? > Source/WebKit/UIProcess/WebProcessPool.cpp:944 > + if (isMatchingStore && (process.get() != m_workerContextProcess)) You're going to need to protect the second check behind a #if ENABLE(SERVICE_WORKER) 1362284 3 324271 youennf 2017-10-19 13:22:35 -0700 Created attachment 324271 Patch 1362288 4 324271 cdumez 2017-10-19 13:28:19 -0700 Comment on attachment 324271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=324271&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:940 > + WebProcessProxy* reusableProcess = nullptr; I would call this processToReuse. LGTM otherwise. 1362290 5 324274 youennf 2017-10-19 13:31:17 -0700 Created attachment 324274 Patch 1362339 6 commit-queue 2017-10-19 14:28:50 -0700 The commit-queue encountered the following flaky tests while processing attachment 324274: The commit-queue is continuing to process your patch. 1362342 7 commit-queue 2017-10-19 14:29:17 -0700 The commit-queue encountered the following flaky tests while processing attachment 324274: http/tests/security/cross-origin-xsl-BLOCKED.html bug 51054 (authors: abarth@webkit.org, jochen@chromium.org, and rniwa@webkit.org) The commit-queue is continuing to process your patch. 1362350 8 324274 cdumez 2017-10-19 14:31:21 -0700 Comment on attachment 324274 Patch Clearing flags on attachment: 324274 Committed r223713: <https://trac.webkit.org/changeset/223713> 1362351 9 cdumez 2017-10-19 14:31:23 -0700 All reviewed patches have been landed. Closing bug. 1362356 10 324274 dbates 2017-10-19 14:36:46 -0700 Comment on attachment 324274 Patch Is it possible to write a test for this change? 1362357 11 cdumez 2017-10-19 14:40:07 -0700 (In reply to Daniel Bates from comment #10) > Comment on attachment 324274 [details] > Patch > > Is it possible to write a test for this change? This is a crash fix which was split out of Bug 178475. When Bug 178475 lands, if API tests and layout tests do not crash, then this patch works as intended. 1372328 12 webkit-bug-importer 2017-11-15 13:02:40 -0800 <rdar://problem/35568673> 324256 2017-10-19 11:57:49 -0700 2017-10-19 13:22:34 -0700 Patch bug-178527-20171019115748.patch text/plain 2940 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYyNzIzOWFkOWJmYTMyNjc2 Njk5ZGU5NWJhYThmOWFkYzEyYmZkNzQuLmI1NWFkZGQ5ZWEzYWRmZWNmZTZmYzA1MzVkNjcxY2U2 NWM3YzNkNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMTAtMTkgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFNlcnZpY2UgV29ya2VyIHByb2Nl c3Mgc2hvdWxkIG5vdCBiZSBzZWxlY3RlZCB0byBvcGVuIFdlYlZpZXcgb24gaXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODUyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlbGVjdGlvbiBvZiBwcm9j ZXNzIHRvIG9wZW4gYSBwYWdlIHdpbGwgbm8gbG9uZ2VyIHVzZSBhbiBleGlzdGluZyB3ZWIgcHJv Y2VzcyBpZiBpdCBpcyB0aGUgc2VydmljZSB3b3JrZXIgcHJvY2Vzcy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQ b29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KToKKwog MjAxNy0xMC0xOCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBE b24ndCBleHBvc2UgcmF3IEhUTUwgaW4gcGFzdGVib2FyZCB0byB0aGUgd2ViIGNvbnRlbnQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCA0ZTY4MGFkMjNl MGY5ZTFhMTkxN2E4NjhhYTZjYTNhYWJmYmM1NzY4Li4zMzA2NWY1YTYxMmZjOTg0ZjM2Y2RiNGIw NWY4YzhiYjkyYmRjNjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bv b2wuY3BwCkBAIC05MzcsMjUgKzkzNywyMCBAQCBXZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQ b29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KAogICAg IGlmIChtX3Byb2Nlc3Nlcy5zaXplKCkgPCBtYXhpbXVtTnVtYmVyT2ZQcm9jZXNzZXMoKSkKICAg ICAgICAgcmV0dXJuIGNyZWF0ZU5ld1dlYlByb2Nlc3Mod2Vic2l0ZURhdGFTdG9yZSk7CiAKLSAg ICBWZWN0b3I8UmVmUHRyPFdlYlByb2Nlc3NQcm94eT4+IHByb2Nlc3Nlc01hdGNoaW5nRGF0YVN0 b3JlOwotICAgIGlmIChtdXN0TWF0Y2hEYXRhU3RvcmUpIHsKLSAgICAgICAgZm9yIChhdXRvJiBw cm9jZXNzIDogbV9wcm9jZXNzZXMpIHsKLSAgICAgICAgICAgIGlmICgmcHJvY2Vzcy0+d2Vic2l0 ZURhdGFTdG9yZSgpID09ICZ3ZWJzaXRlRGF0YVN0b3JlKQotICAgICAgICAgICAgICAgIHByb2Nl c3Nlc01hdGNoaW5nRGF0YVN0b3JlLmFwcGVuZChwcm9jZXNzKTsKLSAgICAgICAgfQotCi0gICAg ICAgIGlmIChwcm9jZXNzZXNNYXRjaGluZ0RhdGFTdG9yZS5pc0VtcHR5KCkpCi0gICAgICAgICAg ICByZXR1cm4gY3JlYXRlTmV3V2ViUHJvY2Vzcyh3ZWJzaXRlRGF0YVN0b3JlKTsKKyAgICBWZWN0 b3I8c3RkOjpyZWZlcmVuY2Vfd3JhcHBlcjxXZWJQcm9jZXNzUHJveHk+PiBwcm9jZXNzZXM7Cisg ICAgcHJvY2Vzc2VzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobV9wcm9jZXNzZXMuc2l6ZSgpKTsK KyAgICBmb3IgKGF1dG8mIHByb2Nlc3MgOiBtX3Byb2Nlc3NlcykgeworICAgICAgICBib29sIGlz TWF0Y2hpbmdTdG9yZSA9ICFtdXN0TWF0Y2hEYXRhU3RvcmUgfHwgJnByb2Nlc3MtPndlYnNpdGVE YXRhU3RvcmUoKSA9PSAmd2Vic2l0ZURhdGFTdG9yZTsKKyAgICAgICAgaWYgKGlzTWF0Y2hpbmdT dG9yZSAmJiAocHJvY2Vzcy5nZXQoKSAhPSBtX3dvcmtlckNvbnRleHRQcm9jZXNzKSkKKyAgICAg ICAgICAgIHByb2Nlc3Nlcy51bmNoZWNrZWRBcHBlbmQoKnByb2Nlc3MpOwogICAgIH0KKyAgICBp ZiAocHJvY2Vzc2VzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGNyZWF0ZU5ld1dlYlByb2Nl c3Mod2Vic2l0ZURhdGFTdG9yZSk7CiAKICAgICAvLyBDaG9vc2UgdGhlIHByb2Nlc3Mgd2l0aCBm ZXdlc3QgcGFnZXMuCi0gICAgYXV0byogcHJvY2Vzc2VzID0gbXVzdE1hdGNoRGF0YVN0b3JlID8g JnByb2Nlc3Nlc01hdGNoaW5nRGF0YVN0b3JlIDogJm1fcHJvY2Vzc2VzOwotICAgIEFTU0VSVCgh cHJvY2Vzc2VzLT5pc0VtcHR5KCkpOwotICAgIGF1dG8mIHByb2Nlc3MgPSAqc3RkOjptaW5fZWxl bWVudChwcm9jZXNzZXMtPmJlZ2luKCksIHByb2Nlc3Nlcy0+ZW5kKCksIFtdKGNvbnN0IFJlZlB0 cjxXZWJQcm9jZXNzUHJveHk+JiBhLCBjb25zdCBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiYgYikg ewotICAgICAgICByZXR1cm4gYS0+cGFnZUNvdW50KCkgPCBiLT5wYWdlQ291bnQoKTsKLSAgICB9 KTsKLQotICAgIHJldHVybiAqcHJvY2VzczsKKyAgICByZXR1cm4gc3RkOjptaW5fZWxlbWVudChw cm9jZXNzZXMuYmVnaW4oKSwgcHJvY2Vzc2VzLmVuZCgpLCBbXSAoYXV0byYgYSwgYXV0byYgYikg eworICAgICAgICByZXR1cm4gYS5nZXQoKS5wYWdlQ291bnQoKSA8IGIuZ2V0KCkucGFnZUNvdW50 KCk7CisgICAgfSktPmdldCgpOwogfQogCiBSZWY8V2ViUGFnZVByb3h5PiBXZWJQcm9jZXNzUG9v bDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBSZWY8QVBJOjpQYWdlQ29u ZmlndXJhdGlvbj4mJiBwYWdlQ29uZmlndXJhdGlvbikK 324271 2017-10-19 13:22:35 -0700 2017-10-19 13:31:16 -0700 Patch bug-178527-20171019132235.patch text/plain 2875 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYyNzIzOWFkOWJmYTMyNjc2 Njk5ZGU5NWJhYThmOWFkYzEyYmZkNzQuLmU0ZWMxYzExZmZjN2M4ZmNjMTIyOThlNWQwY2IxZjE2 OWRjMmU3OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMTAtMTkgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFNlcnZpY2UgV29ya2VyIHByb2Nl c3Mgc2hvdWxkIG5vdCBiZSBzZWxlY3RlZCB0byBvcGVuIFdlYlZpZXcgb24gaXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODUyNworCisgICAgICAg IFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFNlbGVjdGlvbiBvZiBwcm9jZXNz IHRvIG9wZW4gYSBwYWdlIHdpbGwgbm8gbG9uZ2VyIHVzZSBhbiBleGlzdGluZyB3ZWIgcHJvY2Vz cyBpZiBpdCBpcyB0aGUgc2VydmljZSB3b3JrZXIgcHJvY2Vzcy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29s OjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KToKKwogMjAx Ny0xMC0xOCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBEb24n dCBleHBvc2UgcmF3IEhUTUwgaW4gcGFzdGVib2FyZCB0byB0aGUgd2ViIGNvbnRlbnQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCA0ZTY4MGFkMjNlMGY5 ZTFhMTkxN2E4NjhhYTZjYTNhYWJmYmM1NzY4Li5kMTI2ZDg0ODU1M2FlYzAxNmFjMDJlOTAzZDAz ZTc5ZWQyMGM5NjdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwCkBAIC05MzcsMjUgKzkzNywxOSBAQCBXZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29s OjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KAogICAgIGlm IChtX3Byb2Nlc3Nlcy5zaXplKCkgPCBtYXhpbXVtTnVtYmVyT2ZQcm9jZXNzZXMoKSkKICAgICAg ICAgcmV0dXJuIGNyZWF0ZU5ld1dlYlByb2Nlc3Mod2Vic2l0ZURhdGFTdG9yZSk7CiAKLSAgICBW ZWN0b3I8UmVmUHRyPFdlYlByb2Nlc3NQcm94eT4+IHByb2Nlc3Nlc01hdGNoaW5nRGF0YVN0b3Jl OwotICAgIGlmIChtdXN0TWF0Y2hEYXRhU3RvcmUpIHsKLSAgICAgICAgZm9yIChhdXRvJiBwcm9j ZXNzIDogbV9wcm9jZXNzZXMpIHsKLSAgICAgICAgICAgIGlmICgmcHJvY2Vzcy0+d2Vic2l0ZURh dGFTdG9yZSgpID09ICZ3ZWJzaXRlRGF0YVN0b3JlKQotICAgICAgICAgICAgICAgIHByb2Nlc3Nl c01hdGNoaW5nRGF0YVN0b3JlLmFwcGVuZChwcm9jZXNzKTsKLSAgICAgICAgfQotCi0gICAgICAg IGlmIChwcm9jZXNzZXNNYXRjaGluZ0RhdGFTdG9yZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBy ZXR1cm4gY3JlYXRlTmV3V2ViUHJvY2Vzcyh3ZWJzaXRlRGF0YVN0b3JlKTsKKyAgICBXZWJQcm9j ZXNzUHJveHkqIHJldXNhYmxlUHJvY2VzcyA9IG51bGxwdHI7CisgICAgZm9yIChhdXRvJiBwcm9j ZXNzIDogbV9wcm9jZXNzZXMpIHsKKyAgICAgICAgaWYgKG11c3RNYXRjaERhdGFTdG9yZSAmJiAm cHJvY2Vzcy0+d2Vic2l0ZURhdGFTdG9yZSgpICE9ICZ3ZWJzaXRlRGF0YVN0b3JlKQorICAgICAg ICAgICAgY29udGludWU7CisjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQorICAgICAgICBpZiAo cHJvY2Vzcy5nZXQoKSA9PSBtX3dvcmtlckNvbnRleHRQcm9jZXNzKQorICAgICAgICAgICAgY29u dGludWU7CisjZW5kaWYKKyAgICAgICAgLy8gQ2hvb3NlIHRoZSBwcm9jZXNzIHdpdGggZmV3ZXN0 IHBhZ2VzLgorICAgICAgICBpZiAoIXJldXNhYmxlUHJvY2VzcyB8fCByZXVzYWJsZVByb2Nlc3Mt PnBhZ2VDb3VudCgpID4gcHJvY2Vzcy0+cGFnZUNvdW50KCkpCisgICAgICAgICAgICByZXVzYWJs ZVByb2Nlc3MgPSBwcm9jZXNzLmdldCgpOwogICAgIH0KLQotICAgIC8vIENob29zZSB0aGUgcHJv Y2VzcyB3aXRoIGZld2VzdCBwYWdlcy4KLSAgICBhdXRvKiBwcm9jZXNzZXMgPSBtdXN0TWF0Y2hE YXRhU3RvcmUgPyAmcHJvY2Vzc2VzTWF0Y2hpbmdEYXRhU3RvcmUgOiAmbV9wcm9jZXNzZXM7Ci0g ICAgQVNTRVJUKCFwcm9jZXNzZXMtPmlzRW1wdHkoKSk7Ci0gICAgYXV0byYgcHJvY2VzcyA9ICpz dGQ6Om1pbl9lbGVtZW50KHByb2Nlc3Nlcy0+YmVnaW4oKSwgcHJvY2Vzc2VzLT5lbmQoKSwgW10o Y29uc3QgUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4mIGEsIGNvbnN0IFJlZlB0cjxXZWJQcm9jZXNz UHJveHk+JiBiKSB7Ci0gICAgICAgIHJldHVybiBhLT5wYWdlQ291bnQoKSA8IGItPnBhZ2VDb3Vu dCgpOwotICAgIH0pOwotCi0gICAgcmV0dXJuICpwcm9jZXNzOworICAgIHJldHVybiByZXVzYWJs ZVByb2Nlc3MgPyAqcmV1c2FibGVQcm9jZXNzIDogY3JlYXRlTmV3V2ViUHJvY2Vzcyh3ZWJzaXRl RGF0YVN0b3JlKTsKIH0KIAogUmVmPFdlYlBhZ2VQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0 ZVdlYlBhZ2UoUGFnZUNsaWVudCYgcGFnZUNsaWVudCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRp b24+JiYgcGFnZUNvbmZpZ3VyYXRpb24pCg== 324274 2017-10-19 13:31:17 -0700 2017-10-19 14:31:21 -0700 Patch bug-178527-20171019133117.patch text/plain 2908 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU1N2FlM2E4Mjc4M2Y4ZDM4 M2I2YzFjMjZkZWI1ODc2ZGFhYWY3OTIuLjZmYjRiOGNiYTkwOWVkMWI0MzgwZmMwOWMxNDczOWUw ZTU2NzBiYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTctMTAtMTkgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCisgICAgICAgIFNlcnZpY2UgV29ya2VyIHByb2Nl c3Mgc2hvdWxkIG5vdCBiZSBzZWxlY3RlZCB0byBvcGVuIFdlYlZpZXcgb24gaXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODUyNworCisgICAgICAg IFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFNlbGVjdGlvbiBvZiBwcm9jZXNz IHRvIG9wZW4gYSBwYWdlIHdpbGwgbm8gbG9uZ2VyIHVzZSBhbiBleGlzdGluZyB3ZWIgcHJvY2Vz cyBpZiBpdCBpcyB0aGUgc2VydmljZSB3b3JrZXIgcHJvY2Vzcy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29s OjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KToKKworMjAx Ny0xMC0xOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKICAgICAgICAgQWRk IEFQSSB0byBjbGVhbiBDYWNoZVN0b3JhZ2UgZGF0YQogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4MDM0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCA0ZTY4MGFkMjNlMGY5ZTFhMTkxN2E4NjhhYTZjYTNh YWJmYmM1NzY4Li44YjJlZThmYjU5OTIxNDllY2U4ZTQ1NWQxMWU4YmMwZDFkMWQ2Zjc2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC05MzcsMjUgKzkz NywxOSBAQCBXZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9j ZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KAogICAgIGlmIChtX3Byb2Nlc3Nlcy5zaXpl KCkgPCBtYXhpbXVtTnVtYmVyT2ZQcm9jZXNzZXMoKSkKICAgICAgICAgcmV0dXJuIGNyZWF0ZU5l d1dlYlByb2Nlc3Mod2Vic2l0ZURhdGFTdG9yZSk7CiAKLSAgICBWZWN0b3I8UmVmUHRyPFdlYlBy b2Nlc3NQcm94eT4+IHByb2Nlc3Nlc01hdGNoaW5nRGF0YVN0b3JlOwotICAgIGlmIChtdXN0TWF0 Y2hEYXRhU3RvcmUpIHsKLSAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzIDogbV9wcm9jZXNzZXMp IHsKLSAgICAgICAgICAgIGlmICgmcHJvY2Vzcy0+d2Vic2l0ZURhdGFTdG9yZSgpID09ICZ3ZWJz aXRlRGF0YVN0b3JlKQotICAgICAgICAgICAgICAgIHByb2Nlc3Nlc01hdGNoaW5nRGF0YVN0b3Jl LmFwcGVuZChwcm9jZXNzKTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChwcm9jZXNzZXNNYXRj aGluZ0RhdGFTdG9yZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm4gY3JlYXRlTmV3V2Vi UHJvY2Vzcyh3ZWJzaXRlRGF0YVN0b3JlKTsKKyAgICBXZWJQcm9jZXNzUHJveHkqIHByb2Nlc3NU b1JldXNlID0gbnVsbHB0cjsKKyAgICBmb3IgKGF1dG8mIHByb2Nlc3MgOiBtX3Byb2Nlc3Nlcykg eworICAgICAgICBpZiAobXVzdE1hdGNoRGF0YVN0b3JlICYmICZwcm9jZXNzLT53ZWJzaXRlRGF0 YVN0b3JlKCkgIT0gJndlYnNpdGVEYXRhU3RvcmUpCisgICAgICAgICAgICBjb250aW51ZTsKKyNp ZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgICAgIGlmIChwcm9jZXNzLmdldCgpID09IG1f d29ya2VyQ29udGV4dFByb2Nlc3MpCisgICAgICAgICAgICBjb250aW51ZTsKKyNlbmRpZgorICAg ICAgICAvLyBDaG9vc2UgdGhlIHByb2Nlc3Mgd2l0aCBmZXdlc3QgcGFnZXMuCisgICAgICAgIGlm ICghcHJvY2Vzc1RvUmV1c2UgfHwgcHJvY2Vzc1RvUmV1c2UtPnBhZ2VDb3VudCgpID4gcHJvY2Vz cy0+cGFnZUNvdW50KCkpCisgICAgICAgICAgICBwcm9jZXNzVG9SZXVzZSA9IHByb2Nlc3MuZ2V0 KCk7CiAgICAgfQotCi0gICAgLy8gQ2hvb3NlIHRoZSBwcm9jZXNzIHdpdGggZmV3ZXN0IHBhZ2Vz LgotICAgIGF1dG8qIHByb2Nlc3NlcyA9IG11c3RNYXRjaERhdGFTdG9yZSA/ICZwcm9jZXNzZXNN YXRjaGluZ0RhdGFTdG9yZSA6ICZtX3Byb2Nlc3NlczsKLSAgICBBU1NFUlQoIXByb2Nlc3Nlcy0+ aXNFbXB0eSgpKTsKLSAgICBhdXRvJiBwcm9jZXNzID0gKnN0ZDo6bWluX2VsZW1lbnQocHJvY2Vz c2VzLT5iZWdpbigpLCBwcm9jZXNzZXMtPmVuZCgpLCBbXShjb25zdCBSZWZQdHI8V2ViUHJvY2Vz c1Byb3h5PiYgYSwgY29uc3QgUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4mIGIpIHsKLSAgICAgICAg cmV0dXJuIGEtPnBhZ2VDb3VudCgpIDwgYi0+cGFnZUNvdW50KCk7Ci0gICAgfSk7Ci0KLSAgICBy ZXR1cm4gKnByb2Nlc3M7CisgICAgcmV0dXJuIHByb2Nlc3NUb1JldXNlID8gKnByb2Nlc3NUb1Jl dXNlIDogY3JlYXRlTmV3V2ViUHJvY2Vzcyh3ZWJzaXRlRGF0YVN0b3JlKTsKIH0KIAogUmVmPFdl YlBhZ2VQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZVdlYlBhZ2UoUGFnZUNsaWVudCYgcGFn ZUNsaWVudCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+JiYgcGFnZUNvbmZpZ3VyYXRpb24p Cg==