222201 2021-02-19 14:32:10 -0800 CrashTracer: com.apple.WebKit.Networking at WebKit: WTF::Detail::CallableWrapper<WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests() 2021-02-19 16:19:15 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney achristensen bfulgham cdumez ddkilzer webkit-bug-importer wilander oldest_to_newest 1731589 0 katherine_cheney 2021-02-19 14:32:10 -0800 There is a crash happening in PrivateClickMeasurementManager::firePendingAttributionRequests() 1731592 1 421033 katherine_cheney 2021-02-19 14:33:53 -0800 Created attachment 421033 Patch 1731593 2 katherine_cheney 2021-02-19 14:34:40 -0800 <rdar://problem/74410516> 1731596 3 421033 achristensen 2021-02-19 14:36:47 -0800 Comment on attachment 421033 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421033&action=review > Source/WebKit/ChangeLog:8 > + Could you put why you think this will fix the crash? 1731602 4 katherine_cheney 2021-02-19 14:48:05 -0800 (In reply to Alex Christensen from comment #3) > Comment on attachment 421033 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421033&action=review > > > Source/WebKit/ChangeLog:8 > > + > > Could you put why you think this will fix the crash? Yes, will update in the next patch. TL;DR: it is crashing here: bool PrivateClickMeasurementManager::featureEnabled() const { return m_networkSession && m_networkProcess->privateClickMeasurementEnabled() && !m_sessionID.isEphemeral(); } thinking it's possible that m_networkProcess is dead when we try to check for m_networkProcess->privateClickMeasurementEnabled(). 1731607 5 421033 bfulgham 2021-02-19 14:54:56 -0800 Comment on attachment 421033 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421033&action=review > Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:57 > + , m_networkProcess(makeWeakPtr(networkProcess)) This is probably the right architecture -- we don't own the network process (i.e. we shouldn't be the thing keeping it alive), so a weakptr makes sense. > Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:-426 > - return m_networkSession && m_networkProcess->privateClickMeasurementEnabled() && !m_sessionID.isEphemeral(); It's a bummer that we can't figure out which of these things is the source of the issue. Perhaps it would be useful to early return if !m_networkSession and !m_networkProcess. 1731626 6 wilander 2021-02-19 15:18:15 -0800 (In reply to Brent Fulgham from comment #5) > Comment on attachment 421033 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421033&action=review > > > Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:57 > > + , m_networkProcess(makeWeakPtr(networkProcess)) > > This is probably the right architecture -- we don't own the network process > (i.e. we shouldn't be the thing keeping it alive), so a weakptr makes sense. > > > Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:-426 > > - return m_networkSession && m_networkProcess->privateClickMeasurementEnabled() && !m_sessionID.isEphemeral(); > > It's a bummer that we can't figure out which of these things is the source > of the issue. Perhaps it would be useful to early return if > !m_networkSession and !m_networkProcess. Yeah, I'm in favor of splitting it into three separate conditionals just to give ourselves the information if it keeps crashing. 1731627 7 achristensen 2021-02-19 15:18:46 -0800 I don't think this will fix your crash 1731629 8 421043 achristensen 2021-02-19 15:19:53 -0800 Created attachment 421043 Patch 1731631 9 katherine_cheney 2021-02-19 15:21:13 -0800 (In reply to Alex Christensen from comment #8) > Created attachment 421043 [details] > Patch This makes so much sense. 1731636 10 cdumez 2021-02-19 15:26:03 -0800 (In reply to katherine_cheney from comment #9) > (In reply to Alex Christensen from comment #8) > > Created attachment 421043 [details] > > Patch > > This makes so much sense. Yes, capturing |this| in a lambda without any kind of lifetime management rarely works out. 1731661 11 ews-feeder 2021-02-19 16:19:00 -0800 Committed r273180: <https://commits.webkit.org/r273180> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421043. 1731662 12 webkit-bug-importer 2021-02-19 16:19:15 -0800 <rdar://problem/74542106> 421033 2021-02-19 14:33:53 -0800 2021-02-19 15:20:10 -0800 Patch bug-222201-20210219143352.patch text/plain 5553 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdjMDJiMWVhMmViNDRlNzE5 ZDgyNGY0ODU0Y2YwZDhiNjBiMzNmYWEuLjM5ZWFiYTgxOWQyYTEyZDU5MTlhMDc4NGZhZGIwNTk5 ZGU3ZDU4YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDItMTkgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2hUcmFjZXI6 IGNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyBhdCBXZWJLaXQ6IFdURjo6RGV0YWlsOjpDYWxs YWJsZVdyYXBwZXI8V2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVQ ZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0cygpOgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMjAxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDQx MDUxNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6UHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnRNYW5hZ2VyOjpnZXRUb2tlblB1YmxpY0tleSk6CisgICAgICAgIChXZWJLaXQ6OlByaXZh dGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Z2V0U2lnbmVkVW5saW5rYWJsZVRva2VuKToKKyAg ICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpmaXJlQ29udmVy c2lvblJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1h bmFnZXI6OmZlYXR1cmVFbmFibGVkIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpkZWJ1Z01vZGVFbmFibGVkIGNvbnN0KToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuaDoKKwogMjAy MS0wMi0xOSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAg ICAgICBDcmVhdGUgU1FMaXRlIHNrZWxldG9uIGltcGxlbWVudGF0aW9uIGZvciBQQ00gZnJhdWQg cHJldmVudGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwCmluZGV4IDcyOWJiYjc2ODg5 Y2E2YjJiNzQ2YTU1MjcxMTcxN2MyODY2MWZlMDEuLjdkNDBiZmY0NjdkZjEyODQ4YmY0OTllN2Nl NzVjMGI4OGQ5OGI3MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAKQEAgLTU0LDcg KzU0LDcgQEAgY29uc3RleHByIFNlY29uZHMgZGVidWdNb2RlU2Vjb25kc1VudGlsU2VuZCB7IDEw X3MgfTsKIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6UHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnRNYW5hZ2VyKE5ldHdvcmtTZXNzaW9uJiBuZXR3b3JrU2Vzc2lvbiwgTmV0d29ya1Byb2Nl c3MmIG5ldHdvcmtQcm9jZXNzLCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiAgICAgOiBtX2Zp cmVQZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0c1RpbWVyKCp0aGlzLCAmUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRNYW5hZ2VyOjpmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMpCiAgICAgLCBt X25ldHdvcmtTZXNzaW9uKG1ha2VXZWFrUHRyKG5ldHdvcmtTZXNzaW9uKSkKLSAgICAsIG1fbmV0 d29ya1Byb2Nlc3MobmV0d29ya1Byb2Nlc3MpCisgICAgLCBtX25ldHdvcmtQcm9jZXNzKG1ha2VX ZWFrUHRyKG5ldHdvcmtQcm9jZXNzKSkKICAgICAsIG1fc2Vzc2lvbklEKHNlc3Npb25JRCkKICAg ICAsIG1fcGluZ0xvYWRGdW5jdGlvbihbXShOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYm IHBhcmFtcywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVy cm9yJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpPiYmIGNvbXBsZXRpb25IYW5k bGVyKSB7CiAgICAgICAgIFVOVVNFRF9QQVJBTShwYXJhbXMpOwpAQCAtMTUxLDYgKzE1MSw5IEBA IHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpnZXRUb2tlblB1YmxpY0tleShQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudCYmCiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAg ICAgICByZXR1cm47CiAKKyAgICAgICAgaWYgKCFtX25ldHdvcmtQcm9jZXNzKQorICAgICAgICAg ICAgcmV0dXJuOworCiAgICAgICAgIGlmICghZXJyb3IuaXNOdWxsKCkpIHsKICAgICAgICAgICAg IG1fbmV0d29ya1Byb2Nlc3MtPmJyb2FkY2FzdENvbnNvbGVNZXNzYWdlKHdlYWtUaGlzLT5tX3Nl c3Npb25JRCwgTWVzc2FnZVNvdXJjZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIE1lc3NhZ2VM ZXZlbDo6RXJyb3IsIG1ha2VTdHJpbmcoIltQcml2YXRlIENsaWNrIE1lYXN1cmVtZW50XSBSZWNl aXZlZCBlcnJvcjogJyJfcywgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSwgIicgZm9yIHVu bGlua2FibGUgdG9rZW4gcHVibGljIGtleSByZXF1ZXN0LiJfcykpOwogICAgICAgICAgICAgcmV0 dXJuOwpAQCAtMTg3LDYgKzE5MCw5IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyOjpnZXRTaWduZWRVbmxpbmthYmxlVG9rZW4oUHJpdmF0ZUNsaWNrTWVhc3VyCiAgICAgICAg IGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgaWYgKCF3ZWFr VGhpcy0+bV9uZXR3b3JrUHJvY2VzcykKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBp ZiAoIWVycm9yLmlzTnVsbCgpKSB7CiAgICAgICAgICAgICB3ZWFrVGhpcy0+bV9uZXR3b3JrUHJv Y2Vzcy0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2Uod2Vha1RoaXMtPm1fc2Vzc2lvbklELCBNZXNz YWdlU291cmNlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgTWVzc2FnZUxldmVsOjpFcnJvciwg bWFrZVN0cmluZygiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRdIFJlY2VpdmVkIGVycm9yOiAn Il9zLCBlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpLCAiJyBmb3IgdW5saW5rYWJsZSB0b2tl biBzaWduaW5nIHJlcXVlc3QuIl9zKSk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC0yNjcsNiAr MjczLDkgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVDb252ZXJz aW9uUmVxdWVzdChjb25zdCBQcml2YXRlQ2xpY2tNZWEKICAgICAgICAgaWYgKCF3ZWFrVGhpcykK ICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBpZiAoIXdlYWtUaGlzLT5tX25ldHdvcmtQ cm9jZXNzKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIGlmICghZXJyb3IuaXNOdWxs KCkpIHsKICAgICAgICAgICAgIHdlYWtUaGlzLT5tX25ldHdvcmtQcm9jZXNzLT5icm9hZGNhc3RD b25zb2xlTWVzc2FnZSh3ZWFrVGhpcy0+bV9zZXNzaW9uSUQsIE1lc3NhZ2VTb3VyY2U6OlByaXZh dGVDbGlja01lYXN1cmVtZW50LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBtYWtlU3RyaW5nKCJbUHJp dmF0ZSBDbGljayBNZWFzdXJlbWVudF0gUmVjZWl2ZWQgZXJyb3I6ICciX3MsIGVycm9yLmxvY2Fs aXplZERlc2NyaXB0aW9uKCksICInIGZvciBhZCBjbGljayBhdHRyaWJ1dGlvbiByZXF1ZXN0LiJf cykpOwogICAgICAgICB9CkBAIC00MjMsMTEgKzQzMiwxNCBAQCB2b2lkIFByaXZhdGVDbGlja01l YXN1cmVtZW50TWFuYWdlcjo6bWFya0FsbFVuYXR0cmlidXRlZEFzRXhwaXJlZEZvclRlc3Rpbmco KQogCiBib29sIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZmVhdHVyZUVuYWJsZWQo KSBjb25zdAogewotICAgIHJldHVybiBtX25ldHdvcmtTZXNzaW9uICYmIG1fbmV0d29ya1Byb2Nl c3MtPnByaXZhdGVDbGlja01lYXN1cmVtZW50RW5hYmxlZCgpICYmICFtX3Nlc3Npb25JRC5pc0Vw aGVtZXJhbCgpOworICAgIHJldHVybiBtX25ldHdvcmtTZXNzaW9uICYmIG1fbmV0d29ya1Byb2Nl c3MgJiYgbV9uZXR3b3JrUHJvY2Vzcy0+cHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRFbmFibGVkKCkg JiYgIW1fc2Vzc2lvbklELmlzRXBoZW1lcmFsKCk7CiB9CiAKIGJvb2wgUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRNYW5hZ2VyOjpkZWJ1Z01vZGVFbmFibGVkKCkgY29uc3QKIHsKKyAgICBpZiAoIWZl YXR1cmVFbmFibGVkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIHJldHVybiBtX25l dHdvcmtQcm9jZXNzLT5wcml2YXRlQ2xpY2tNZWFzdXJlbWVudERlYnVnTW9kZUVuYWJsZWQoKSAm JiAhbV9zZXNzaW9uSUQuaXNFcGhlbWVyYWwoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuaCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2Vy LmgKaW5kZXggNTczZjMzY2UyYzM1NjM4YzYwZGVlYTdlNGY5YTc5NjkxY2YwYzg0Mi4uNGVlOGUw ZmVkMzc4OTA5MzdmNjZlYWJiYWU4NGUwMDYxMjZiNDhkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlci5oCkBAIC04NSw3ICs4NSw3IEBAIHByaXZhdGU6CiAgICAgT3B0aW9uYWw8VVJMPiBtX3Rv a2VuU2lnbmF0dXJlVVJMRm9yVGVzdGluZzsKICAgICBPcHRpb25hbDxVUkw+IG1fYXR0cmlidXRp b25SZXBvcnRCYXNlVVJMRm9yVGVzdGluZzsKICAgICBXZWFrUHRyPE5ldHdvcmtTZXNzaW9uPiBt X25ldHdvcmtTZXNzaW9uOwotICAgIFJlZjxOZXR3b3JrUHJvY2Vzcz4gbV9uZXR3b3JrUHJvY2Vz czsKKyAgICBXZWFrUHRyPE5ldHdvcmtQcm9jZXNzPiBtX25ldHdvcmtQcm9jZXNzOwogICAgIFBB TDo6U2Vzc2lvbklEIG1fc2Vzc2lvbklEOwogICAgIEZ1bmN0aW9uPHZvaWQoTmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnMmJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZUVycm9yJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpPiYmKT4g bV9waW5nTG9hZEZ1bmN0aW9uOwogfTsK 421043 2021-02-19 15:19:53 -0800 2021-02-19 16:19:01 -0800 Patch bug-222201-20210219151953.patch text/plain 2489 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzMxNjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTE5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ3Jhc2hUcmFjZXI6 IGNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyBhdCBXZWJLaXQ6IFdURjo6RGV0YWlsOjpDYWxs YWJsZVdyYXBwZXI8V2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVQ ZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIyMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVt ZW50TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50 TWFuYWdlcjo6YXR0cmlidXRlKToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnRNYW5hZ2VyOjpmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMpOgorCiAyMDIxLTAy LTE5ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAgTGVnYWN5 IENETSBkb2Vzbid0IHdvcmsgd2hlbiBHUFUgbWVkaWEgcHJvY2VzcyBpcyBlbmFibGVkCkluZGV4 OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwCShyZXZpc2lvbiAyNzMxMDkpCisrKyBTb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE3OSw3ICsxNzksOSBAQCB2b2lkIFByaXZhdGVDbGlja01l YXN1cmVtZW50TWFuYWdlcjo6YXR0CiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChhdXRvKiBy ZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3Rh dGlzdGljcygpKSB7Ci0gICAgICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPmF0dHJpYnV0ZVBy aXZhdGVDbGlja01lYXN1cmVtZW50KHNvdXJjZVNpdGUsIGF0dHJpYnV0ZU9uU2l0ZSwgV1RGTW92 ZShhdHRyaWJ1dGlvblRyaWdnZXJEYXRhKSwgW3RoaXNdIChhdXRvIG9wdGlvbmFsU2Vjb25kc1Vu dGlsU2VuZCkgeworICAgICAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5hdHRyaWJ1dGVQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudChzb3VyY2VTaXRlLCBhdHRyaWJ1dGVPblNpdGUsIFdURk1vdmUo YXR0cmlidXRpb25UcmlnZ2VyRGF0YSksIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0 aGlzKV0gKGF1dG8gb3B0aW9uYWxTZWNvbmRzVW50aWxTZW5kKSB7CisgICAgICAgICAgICBpZiAo IXdlYWtUaGlzKQorICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIGlmIChvcHRp b25hbFNlY29uZHNVbnRpbFNlbmQpIHsKICAgICAgICAgICAgICAgICBhdXRvIHNlY29uZHNVbnRp bFNlbmQgPSAqb3B0aW9uYWxTZWNvbmRzVW50aWxTZW5kOwogICAgICAgICAgICAgICAgIGlmICht X2ZpcmVQZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0c1RpbWVyLmlzQWN0aXZlKCkgJiYgbV9maXJl UGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHNUaW1lci5uZXh0RmlyZUludGVydmFsKCkgPCBzZWNv bmRzVW50aWxTZW5kKQpAQCAtMjQzLDcgKzI0NSw5IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnRNYW5hZ2VyOjpmaXIKICAgICBpZiAoIXJlc291cmNlTG9hZFN0YXRpc3RpY3MpCiAgICAg ICAgIHJldHVybjsKIAotICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPmFsbEF0dHJpYnV0ZWRQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudChbdGhpc10gKGF1dG8mJiBhdHRyaWJ1dGlvbnMpIHsKKyAg ICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5hbGxBdHRyaWJ1dGVkUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnQoW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSAoYXV0byYmIGF0dHJp YnV0aW9ucykgeworICAgICAgICBpZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICBhdXRvIG5leHRUaW1lVG9GaXJlID0gU2Vjb25kczo6aW5maW5pdHkoKTsKICAgICAg ICAgYm9vbCBoYXNTZW50QXR0cmlidXRpb24gPSBmYWxzZTsKIAo=