224056 2021-04-01 10:25:17 -0700 Share same code between network process termination and crash handling 2021-04-01 15:28:14 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224022 InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ggaren kkinnunen webkit-bug-importer oldest_to_newest 1746093 0 cdumez 2021-04-01 10:25:17 -0700 Share same code between network process termination and crash handling. This would avoid bugs such as Bug 224022. 1746095 1 424911 cdumez 2021-04-01 10:30:03 -0700 Created attachment 424911 Patch 1746141 2 424911 achristensen 2021-04-01 11:59:17 -0700 Comment on attachment 424911 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424911&action=review > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:-1745 > - processPool->terminateServiceWorkers(); Does this have a replacement? 1746147 3 424911 cdumez 2021-04-01 12:01:06 -0700 Comment on attachment 424911 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424911&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:484 > m_automationSession->terminate(); Yes, networkProcessDidTerminate() gets called on termination now and terminates the service workers 2 lines below here. 1746294 4 ews-feeder 2021-04-01 15:27:25 -0700 Committed r275389: <https://commits.webkit.org/r275389> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424911. 1746295 5 webkit-bug-importer 2021-04-01 15:28:14 -0700 <rdar://problem/76124951> 424911 2021-04-01 10:30:03 -0700 2021-04-01 15:27:25 -0700 Patch bug-224056-20210401103003.patch text/plain 9717 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE5N2E2MThkOTQ5NjAzYzg0 YjdlYzlkYzdiYWM1YTcwMjM5ZGE3MmEuLmRlNDI0MTgzYjE3N2FjYmI1NWFiOTc4OTI3Nzc4ZjQ4 YjQ5N2NmYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDQtMDEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBTaGFyZSBzYW1lIGNvZGUgYmV0d2Vl biBuZXR3b3JrIHByb2Nlc3MgdGVybWluYXRpb24gYW5kIGNyYXNoIGhhbmRsaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQwNTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFyZSBzYW1lIGNvZGUg YmV0d2VlbiBuZXR3b3JrIHByb2Nlc3MgdGVybWluYXRpb24gYW5kIGNyYXNoIGhhbmRsaW5nLiBU aGlzIHdvdWxkIGF2b2lkCisgICAgICAgIGJ1Z3Mgc3VjaCBhcyBCdWcgMjI0MDIyLgorCisgICAg ICAgICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OnRlcm1pbmF0ZSk6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHk6Om5ldHdvcmtQcm9jZXNzRGlkVGVybWluYXRlKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6ZGlkQ2xvc2UpOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkaWRUZXJtaW5hdGUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpuZXR3b3JrUHJvY2Vzc0NyYXNo ZWQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bmV0d29ya1Byb2Nlc3NEaWRUZXJtaW5hdGUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKTog RGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6Om5ldHdvcmtQcm9jZXNzRGlkVGVybWluYXRlKToKKyAg ICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6dGVybWluYXRlTmV0d29ya1Byb2Nlc3Mp OgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpuZXR3b3JrUHJvY2Vzc0NyYXNo ZWQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0 YVN0b3JlLmg6CisKIDIwMjEtMDQtMDEgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjc1MzUwLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5 LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94 eS5jcHAKaW5kZXggNjkyZjczMjRjNWY2YmQ4OTFmMGEzY2FmZjUzOGM0NDM4Njc2OTRlYy4uNjhj MDUyY2VmYmQwZDM1ZGE0ZTk5NmExZWNjOTQ5YmE0NmM2ZjUyMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCkBA IC0xMTksMTMgKzExOSw3IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6dGVybWluYXRlKCkK ICAgICBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OnRlcm1pbmF0ZSgpOwogICAgIGlmIChhdXRvKiBj b25uZWN0aW9uID0gdGhpcy0+Y29ubmVjdGlvbigpKQogICAgICAgICBjb25uZWN0aW9uLT5pbnZh bGlkYXRlKCk7Ci0gICAgZGlkVGVybWluYXRlKCk7Ci19Ci0KLXZvaWQgTmV0d29ya1Byb2Nlc3NQ cm94eTo6ZGlkVGVybWluYXRlKCkKLXsKLSAgICBpZiAodGhpcyA9PSBkZWZhdWx0UHJvY2Vzcygp LmdldCgpKQotICAgICAgICBkZWZhdWx0UHJvY2VzcygpID0gbnVsbHB0cjsKKyAgICBuZXR3b3Jr UHJvY2Vzc0RpZFRlcm1pbmF0ZShUZXJtaW5hdGlvblJlYXNvbjo6UmVxdWVzdGVkQnlDbGllbnQp OwogfQogCiB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnNlbmRDcmVhdGlvblBhcmFtZXRlcnNU b05ld1Byb2Nlc3MoKQpAQCAtMzQ2LDggKzM0MCwxOCBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJv eHk6OnJlbmFtZU9yaWdpbkluV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBj bwogICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlJlbmFt ZU9yaWdpbkluV2Vic2l0ZURhdGEoc2Vzc2lvbklELCBvbGROYW1lLCBuZXdOYW1lLCBkYXRhVHlw ZXMpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKLXZvaWQgTmV0d29ya1Byb2Nl c3NQcm94eTo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKCkKK3ZvaWQgTmV0d29ya1Byb2Nlc3NQcm94 eTo6bmV0d29ya1Byb2Nlc3NEaWRUZXJtaW5hdGUoVGVybWluYXRpb25SZWFzb24gcmVhc29uKQog eworICAgIGlmIChtX2Rvd25sb2FkUHJveHlNYXApCisgICAgICAgIG1fZG93bmxvYWRQcm94eU1h cC0+aW52YWxpZGF0ZSgpOworI2lmIEVOQUJMRShMRUdBQ1lfQ1VTVE9NX1BST1RPQ09MX01BTkFH RVIpCisgICAgbV9jdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eS5pbnZhbGlkYXRlKCk7CisjZW5k aWYKKworICAgIG1fYWN0aXZpdHlGb3JIb2xkaW5nTG9ja2VkRmlsZXMgPSBudWxscHRyOworCisg ICAgbV91cGxvYWRBY3Rpdml0eSA9IFdURjo6bnVsbG9wdDsKKwogICAgIGlmIChkZWZhdWx0UHJv Y2VzcygpID09IHRoaXMpCiAgICAgICAgIGRlZmF1bHRQcm9jZXNzKCkgPSBudWxscHRyOwogCkBA IC0zNTUsOSArMzU5LDkgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpuZXR3b3JrUHJvY2Vz c0NyYXNoZWQoKQogCiAgICAgUmVmPE5ldHdvcmtQcm9jZXNzUHJveHk+IHByb3RlY3RlZFRoaXMo KnRoaXMpOwogICAgIGZvciAoYXV0byogcHJvY2Vzc1Bvb2wgOiBXZWJQcm9jZXNzUG9vbDo6YWxs UHJvY2Vzc1Bvb2xzKCkpCi0gICAgICAgIHByb2Nlc3NQb29sLT5uZXR3b3JrUHJvY2Vzc0NyYXNo ZWQoKnRoaXMpOworICAgICAgICBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3NEaWRUZXJtaW5h dGUoKnRoaXMsIHJlYXNvbik7CiAgICAgZm9yIChhdXRvJiB3ZWJzaXRlRGF0YVN0b3JlIDogbV93 ZWJzaXRlRGF0YVN0b3JlcykKLSAgICAgICAgd2Vic2l0ZURhdGFTdG9yZS5uZXR3b3JrUHJvY2Vz c0NyYXNoZWQoKnRoaXMpOworICAgICAgICB3ZWJzaXRlRGF0YVN0b3JlLm5ldHdvcmtQcm9jZXNz RGlkVGVybWluYXRlKCp0aGlzKTsKIH0KIAogdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpjbGVh ckNhbGxiYWNrU3RhdGVzKCkKQEAgLTM5MCwxOCArMzk0LDggQEAgYm9vbCBOZXR3b3JrUHJvY2Vz c1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9u LCBJUEMKIAogdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkaWRDbG9zZShJUEM6OkNvbm5lY3Rp b24mKQogewotICAgIGlmIChtX2Rvd25sb2FkUHJveHlNYXApCi0gICAgICAgIG1fZG93bmxvYWRQ cm94eU1hcC0+aW52YWxpZGF0ZSgpOwotI2lmIEVOQUJMRShMRUdBQ1lfQ1VTVE9NX1BST1RPQ09M X01BTkFHRVIpCi0gICAgbV9jdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eS5pbnZhbGlkYXRlKCk7 Ci0jZW5kaWYKLQotICAgIG1fYWN0aXZpdHlGb3JIb2xkaW5nTG9ja2VkRmlsZXMgPSBudWxscHRy OwotCi0gICAgbV91cGxvYWRBY3Rpdml0eSA9IFdURjo6bnVsbG9wdDsKLQogICAgIC8vIFRoaXMg d2lsbCBjYXVzZSB1cyB0byBiZSBkZWxldGVkLgotICAgIG5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCgp OworICAgIG5ldHdvcmtQcm9jZXNzRGlkVGVybWluYXRlKFRlcm1pbmF0aW9uUmVhc29uOjpDcmFz aCk7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZUludmFsaWRNZXNz YWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpNZXNzYWdlTmFtZSBtZXNzYWdl TmFtZSkKQEAgLTUwMyw3ICs0OTcsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OmRpZEZp bmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJUEM6OkNvbgogICAgIEF1 eGlsaWFyeVByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKGxhdW5jaGVyLCBjb25uZWN0 aW9uSWRlbnRpZmllcik7CiAKICAgICBpZiAoIUlQQzo6Q29ubmVjdGlvbjo6aWRlbnRpZmllcklz VmFsaWQoY29ubmVjdGlvbklkZW50aWZpZXIpKSB7Ci0gICAgICAgIG5ldHdvcmtQcm9jZXNzQ3Jh c2hlZCgpOworICAgICAgICBuZXR3b3JrUHJvY2Vzc0RpZFRlcm1pbmF0ZShUZXJtaW5hdGlvblJl YXNvbjo6Q3Jhc2gpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAppbmRl eCA4NjFjM2E4MjQyNjhlMTM2N2I2YTc0ZmM2YTYxNGEyMWU0NGVlMjQ4Li5lYWZiZTRmMDcyOWMz ODE5OTBjMDk3MjI5Yjk1MjA2YWNiMzZmMmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaApAQCAtMTE1LDcgKzExNSw2 IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgVmVjdG9yPFJlZjxOZXR3b3JrUHJvY2Vzc1Byb3h5Pj4g YWxsTmV0d29ya1Byb2Nlc3NlcygpOwogICAgIAogICAgIHZvaWQgdGVybWluYXRlKCkgZmluYWw7 Ci0gICAgdm9pZCBkaWRUZXJtaW5hdGUoKTsKIAogICAgIHZvaWQgZ2V0TmV0d29ya1Byb2Nlc3ND b25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSYsIE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6Okdl dE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbkRlbGF5ZWRSZXBseSYmKTsKIApAQCAtMjM3LDcgKzIz Niw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlZ2lzdGVyU2NoZW1lRm9yTGVnYWN5Q3VzdG9tUHJv dG9jb2woY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCB1bnJlZ2lzdGVyU2NoZW1lRm9yTGVnYWN5 Q3VzdG9tUHJvdG9jb2woY29uc3QgU3RyaW5nJik7CiAKLSAgICB2b2lkIG5ldHdvcmtQcm9jZXNz Q3Jhc2hlZCgpOworICAgIGVudW0gY2xhc3MgVGVybWluYXRpb25SZWFzb24geyBSZXF1ZXN0ZWRC eUNsaWVudCwgQ3Jhc2ggfTsKKyAgICB2b2lkIG5ldHdvcmtQcm9jZXNzRGlkVGVybWluYXRlKFRl cm1pbmF0aW9uUmVhc29uKTsKICAgICAKICAgICB2b2lkIHJlc2V0UXVvdGEoUEFMOjpTZXNzaW9u SUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBzZXRRdW90YUxvZ2dp bmdFbmFibGVkKFBBTDo6U2Vzc2lvbklELCBib29sIGVuYWJsZWQsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoKT4mJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAK aW5kZXggMjcxODYzNDJlZmQxMjY2ZjFiN2U4YmIzMGNlOTk3YTYwMGJhZGJhNC4uNTU4MjgwNjY2 Zjk0ZjUxMGQ0OTQxYzg4NmE4YWMxMjNjYzcwNGY0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtNDcyLDEyICs0NzIsMTMgQEAgdm9pZCBXZWJQcm9j ZXNzUG9vbDo6c2NyZWVuUHJvcGVydGllc1N0YXRlQ2hhbmdlZCgpCiAjZW5kaWYKIH0KIAotdm9p ZCBXZWJQcm9jZXNzUG9vbDo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKE5ldHdvcmtQcm9jZXNzUHJv eHkmIG5ldHdvcmtQcm9jZXNzUHJveHkpCit2b2lkIFdlYlByb2Nlc3NQb29sOjpuZXR3b3JrUHJv Y2Vzc0RpZFRlcm1pbmF0ZShOZXR3b3JrUHJvY2Vzc1Byb3h5JiBuZXR3b3JrUHJvY2Vzc1Byb3h5 LCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpUZXJtaW5hdGlvblJlYXNvbiByZWFzb24pCiB7CiAgICAg Zm9yIChhdXRvJiBzdXBwbGVtZW50IDogbV9zdXBwbGVtZW50cy52YWx1ZXMoKSkKICAgICAgICAg c3VwcGxlbWVudC0+cHJvY2Vzc0RpZENsb3NlKCZuZXR3b3JrUHJvY2Vzc1Byb3h5KTsKIAotICAg IG1fY2xpZW50Lm5ldHdvcmtQcm9jZXNzRGlkQ3Jhc2godGhpcyk7CisgICAgaWYgKHJlYXNvbiA9 PSBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpUZXJtaW5hdGlvblJlYXNvbjo6Q3Jhc2gpCisgICAgICAg IG1fY2xpZW50Lm5ldHdvcmtQcm9jZXNzRGlkQ3Jhc2godGhpcyk7CiAKICAgICBpZiAobV9hdXRv bWF0aW9uU2Vzc2lvbikKICAgICAgICAgbV9hdXRvbWF0aW9uU2Vzc2lvbi0+dGVybWluYXRlKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCAzMTMwMzAyMjVl OTVjMWYwNzU1NmVhYThiYjZmOGI5M2FmODAzNTU4Li5mNDA2MzEyNDExMGNiMmZkNmQ4ZjdiOGJh NjgzMTQxNmIyMGQ3OWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmgKQEAgLTM2OCw3ICszNjgsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogICAgIC8vIE5ldHdvcmsg UHJvY2VzcyBNYW5hZ2VtZW50Ci0gICAgdm9pZCBuZXR3b3JrUHJvY2Vzc0NyYXNoZWQoTmV0d29y a1Byb2Nlc3NQcm94eSYpOworICAgIHZvaWQgbmV0d29ya1Byb2Nlc3NEaWRUZXJtaW5hdGUoTmV0 d29ya1Byb2Nlc3NQcm94eSYsIE5ldHdvcmtQcm9jZXNzUHJveHk6OlRlcm1pbmF0aW9uUmVhc29u KTsKIAogICAgIGJvb2wgaXNTZXJ2aWNlV29ya2VyUGFnZUlEKFdlYlBhZ2VQcm94eUlkZW50aWZp ZXIpIGNvbnN0OwogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5k ZXggMTUyYTJhYmNkNWUzNWVmZDgzMDIxYjNkYzY4ZDc1ODhjMWNmYWI2Zi4uYTI3YTkzYTk2NDAw MTY2MDQxZDE5OGFlODQ5M2NlYTlhODZmYTIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTE3MzEs MjMgKzE3MzEsMTYgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpnZXROZXR3b3JrUHJvY2Vzc0Nv bm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5JiB3ZWJQcm9jZXNzUHIKICAgICB9KTsKIH0KIAotdm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQoTmV0d29ya1Byb2Nlc3NQ cm94eSYpCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6Om5ldHdvcmtQcm9jZXNzRGlkVGVybWluYXRl KE5ldHdvcmtQcm9jZXNzUHJveHkmIG5ldHdvcmtQcm9jZXNzKQogewotICAgIGlmIChtX25ldHdv cmtQcm9jZXNzKQotICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5kaWRUZXJtaW5hdGUoKTsKKyAg ICBBU1NFUlQoIW1fbmV0d29ya1Byb2Nlc3MgfHwgbV9uZXR3b3JrUHJvY2VzcyA9PSAmbmV0d29y a1Byb2Nlc3MpOwogICAgIG1fbmV0d29ya1Byb2Nlc3MgPSBudWxscHRyOwogfQogCiB2b2lkIFdl YnNpdGVEYXRhU3RvcmU6OnRlcm1pbmF0ZU5ldHdvcmtQcm9jZXNzKCkKIHsKLSAgICBhdXRvIHBy b2Nlc3NQb29scyA9IGNvcHlUb1ZlY3Rvck9mPFJlZlB0cjxXZWJQcm9jZXNzUG9vbD4+KFdlYlBy b2Nlc3NQb29sOjphbGxQcm9jZXNzUG9vbHMoKSk7Ci0gICAgZm9yIChhdXRvJiBwcm9jZXNzUG9v bCA6IHByb2Nlc3NQb29scykKLSAgICAgICAgcHJvY2Vzc1Bvb2wtPnRlcm1pbmF0ZVNlcnZpY2VX b3JrZXJzKCk7Ci0KLSAgICBpZiAoIW1fbmV0d29ya1Byb2Nlc3MpCi0gICAgICAgIHJldHVybjsK LSAgICBtX25ldHdvcmtQcm9jZXNzLT50ZXJtaW5hdGUoKTsKLSAgICBtX25ldHdvcmtQcm9jZXNz ID0gbnVsbHB0cjsKKyAgICBpZiAoYXV0byBuZXR3b3JrUHJvY2VzcyA9IHN0ZDo6ZXhjaGFuZ2Uo bV9uZXR3b3JrUHJvY2VzcywgbnVsbHB0cikpCisgICAgICAgIG5ldHdvcmtQcm9jZXNzLT50ZXJt aW5hdGUoKTsKIH0KIAogdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NQ cmVwYXJlVG9TdXNwZW5kRm9yVGVzdGluZyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKaW5kZXggOGI0ZDQxMzQxNDJkZmVjMDE3NDE1OGVh YmJkMTY1YzQxZGNkZWRjNi4uMDJkZjUyZTMwYmY4ZjBlY2YwNmMyYmUzZjc5YTNkZTZkYWNhZGQ2 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0 ZURhdGFTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl YnNpdGVEYXRhU3RvcmUuaApAQCAtMTM5LDcgKzEzOSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNl bmROZXR3b3JrUHJvY2Vzc1ByZXBhcmVUb1N1c3BlbmRGb3JUZXN0aW5nKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBzZW5kTmV0d29ya1Byb2Nlc3NXaWxsU3VzcGVuZElt bWluZW50bHlGb3JUZXN0aW5nKCk7CiAgICAgdm9pZCBzZW5kTmV0d29ya1Byb2Nlc3NEaWRSZXN1 bWUoKTsKLSAgICB2b2lkIG5ldHdvcmtQcm9jZXNzQ3Jhc2hlZChOZXR3b3JrUHJvY2Vzc1Byb3h5 Jik7CisgICAgdm9pZCBuZXR3b3JrUHJvY2Vzc0RpZFRlcm1pbmF0ZShOZXR3b3JrUHJvY2Vzc1By b3h5Jik7CiAgICAgc3RhdGljIHZvaWQgbWFrZU5leHROZXR3b3JrUHJvY2Vzc0xhdW5jaEZhaWxG b3JUZXN0aW5nKCk7CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkTWFrZU5leHROZXR3b3JrUHJvY2Vz c0xhdW5jaEZhaWxGb3JUZXN0aW5nKCk7CiAK