219860 2020-12-14 10:22:29 -0800 CrashTracer: com.apple.WebKit.Networking at WebKit: WTF::Detail::CallableWrapper<WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests() 2020-12-15 10:28:22 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney achristensen ddkilzer webkit-bug-importer wilander oldest_to_newest 1714480 0 katherine_cheney 2020-12-14 10:22:29 -0800 We are hitting this crash after PCM code was migrated to use SQLite. 1714494 1 416172 katherine_cheney 2020-12-14 10:55:52 -0800 Created attachment 416172 Patch 1714495 2 katherine_cheney 2020-12-14 10:56:28 -0800 <rdar://problem/72254207> 1714528 3 416172 achristensen 2020-12-14 11:53:23 -0800 Comment on attachment 416172 Patch From the description, I think this should just add this: if (!m_networkSession) return; 1714532 4 katherine_cheney 2020-12-14 11:58:27 -0800 (In reply to Alex Christensen from comment #3) > Comment on attachment 416172 [details] > Patch > > From the description, I think this should just add this: > if (!m_networkSession) > return; I thought if (auto* resourceLoadStatistics = m_networkSession->resourceLoadStatistics()) would check m_networkSession but maybe I am wrong? If so I should check m_networkSession in other PrivateClickMeasurementManager functions to be consistent. 1714533 5 achristensen 2020-12-14 11:59:19 -0800 if (auto* resourceLoadStatistics = m_networkSession ? m_networkSession->resourceLoadStatistics() : nullptr) checks m_networkSession, but what you have doesn't. 1714538 6 416180 katherine_cheney 2020-12-14 12:10:19 -0800 Created attachment 416180 Patch 1714563 7 ews-feeder 2020-12-14 12:59:14 -0800 Committed r270802: <https://trac.webkit.org/changeset/270802> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416180. 1714565 8 webkit-bug-importer 2020-12-14 13:01:44 -0800 <rdar://problem/72310410> 1714656 9 416180 wilander 2020-12-14 17:34:23 -0800 Comment on attachment 416180 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416180&action=review An easier way to fix this is to move the null check into PrivateClickMeasurementManager::featureEnabled(). > Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:302 > + return; We need to also call the completion handler here. > Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:342 > + return; We need to also call the completion handler here. 1714664 10 416180 achristensen 2020-12-14 18:25:13 -0800 Comment on attachment 416180 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416180&action=review >> Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp:302 >> + return; > > We need to also call the completion handler here. yes we certainly do. Also in the case before if resourceLoadStatistics is null. 1714769 11 katherine_cheney 2020-12-15 08:54:02 -0800 Reopening to attach new patch. 1714770 12 416253 katherine_cheney 2020-12-15 08:54:03 -0800 Created attachment 416253 Patch 1714804 13 ews-feeder 2020-12-15 10:28:21 -0800 Committed r270852: <https://trac.webkit.org/changeset/270852> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416253. 416172 2020-12-14 10:55:52 -0800 2020-12-14 12:10:18 -0800 Patch bug-219860-20201214105551.patch text/plain 4058 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUwZWJlZThmMTUxMThlN2Jl NTBkYzFlYzE5YzUyZDFhOGQzODNhZWIuLmU5NTk5ZTBkMzdkYThmNmJiODE0MTMwYzk4NWZkZDA1 ZDYxYWI1MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMTItMTQgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2hUcmFjZXI6 IGNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyBhdCBXZWJLaXQ6IFdURjo6RGV0YWlsOjpDYWxs YWJsZVdyYXBwZXI8V2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVQ ZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcyMjU0 MjA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG1f bmV0d29ya1Nlc3Npb24gaXMgYSB3ZWFrUHRyLiBXZSBzaG91bGQgY2hlY2sgdGhhdCB0aGUgb2Jq ZWN0IGl0CisgICAgICAgIHJlZmVyZW5jZXMgZXhpc3RzIGJlZm9yZSB0cnlpbmcgdG8gdXNlIGl0 LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2Vy OjpmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMpOgorCiAyMDIwLTEyLTE0ICBDaHJpcyBE dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVByb2Nlc3NdIENyYXNoIHVu ZGVyIEF1ZGlvRGVzdGluYXRpb25Db2NvYTo6c2V0SXNQbGF5aW5nKGJvb2wpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlci5jcHAKaW5kZXggZjUxNDA2M2JmYTJkOTdlMDNjYjQ3ZmU4MDMwNzVmMDU4 MDA2MGIyMi4uZjIxNzU5OWMxMDQ3ZGJjZGJmNmQ1MTc0MTllZmJiY2Y3NDE4NjJkNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVu dE1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApAQCAtMjEwLDM4ICsyMTAsMzUgQEAgdm9pZCBQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnVwZGF0ZVRpbWVyTGFzdEZpcmVkKCkKIHZvaWQg UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVx dWVzdHMoKQogewogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCi0gICAgYXV0 byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9h ZFN0YXRpc3RpY3MoKTsKLSAgICBpZiAoIXJlc291cmNlTG9hZFN0YXRpc3RpY3MpCi0gICAgICAg IHJldHVybjsKKyAgICBpZiAoYXV0byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29y a1Nlc3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSkgeworICAgICAgICByZXNvdXJjZUxv YWRTdGF0aXN0aWNzLT5hbGxBdHRyaWJ1dGVkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoW3RoaXNd IChhdXRvJiYgYXR0cmlidXRpb25zKSB7CisgICAgICAgICAgICBhdXRvIG5leHRUaW1lVG9GaXJl ID0gU2Vjb25kczo6aW5maW5pdHkoKTsKKyAgICAgICAgICAgIFZlY3RvcjxQcml2YXRlQ2xpY2tN ZWFzdXJlbWVudD4gc2VudEF0dHJpYnV0aW9uczsKKyAgICAgICAgICAgIGZvciAoYXV0byYgYXR0 cmlidXRpb24gOiBhdHRyaWJ1dGlvbnMpIHsKKyAgICAgICAgICAgICAgICBhdXRvIGVhcmxpZXN0 VGltZVRvU2VuZCA9IGF0dHJpYnV0aW9uLmVhcmxpZXN0VGltZVRvU2VuZCgpOworICAgICAgICAg ICAgICAgIGlmICghZWFybGllc3RUaW1lVG9TZW5kKSB7CisgICAgICAgICAgICAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgICAgICB9CiAKLSAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5hbGxBdHRyaWJ1dGVk UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoW3RoaXNdIChhdXRvJiYgYXR0cmlidXRpb25zKSB7Ci0g ICAgICAgIGF1dG8gbmV4dFRpbWVUb0ZpcmUgPSBTZWNvbmRzOjppbmZpbml0eSgpOwotICAgICAg ICBWZWN0b3I8UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ+IHNlbnRBdHRyaWJ1dGlvbnM7Ci0gICAg ICAgIAotICAgICAgICBmb3IgKGF1dG8mIGF0dHJpYnV0aW9uIDogYXR0cmlidXRpb25zKSB7Ci0g ICAgICAgICAgICBhdXRvIGVhcmxpZXN0VGltZVRvU2VuZCA9IGF0dHJpYnV0aW9uLmVhcmxpZXN0 VGltZVRvU2VuZCgpOwotICAgICAgICAgICAgaWYgKCFlYXJsaWVzdFRpbWVUb1NlbmQpIHsKLSAg ICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAgICBjb250 aW51ZTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBhdXRvIG5vdyA9IFdhbGxUaW1l Ojpub3coKTsKKyAgICAgICAgICAgICAgICBpZiAoKmVhcmxpZXN0VGltZVRvU2VuZCA8PSBub3cg fHwgbV9pc1J1bm5pbmdUZXN0IHx8IGRlYnVnTW9kZUVuYWJsZWQoKSkgeworICAgICAgICAgICAg ICAgICAgICBmaXJlQ29udmVyc2lvblJlcXVlc3QoYXR0cmlidXRpb24pOworICAgICAgICAgICAg ICAgICAgICBzZW50QXR0cmlidXRpb25zLmFwcGVuZChXVEZNb3ZlKGF0dHJpYnV0aW9uKSk7Cisg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIH0KIAotICAgICAg ICAgICAgYXV0byBub3cgPSBXYWxsVGltZTo6bm93KCk7Ci0gICAgICAgICAgICBpZiAoKmVhcmxp ZXN0VGltZVRvU2VuZCA8PSBub3cgfHwgbV9pc1J1bm5pbmdUZXN0IHx8IGRlYnVnTW9kZUVuYWJs ZWQoKSkgewotICAgICAgICAgICAgICAgIGZpcmVDb252ZXJzaW9uUmVxdWVzdChhdHRyaWJ1dGlv bik7Ci0gICAgICAgICAgICAgICAgc2VudEF0dHJpYnV0aW9ucy5hcHBlbmQoV1RGTW92ZShhdHRy aWJ1dGlvbikpOwotICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIGF1 dG8gc2Vjb25kcyA9ICplYXJsaWVzdFRpbWVUb1NlbmQgLSBub3c7CisgICAgICAgICAgICAgICAg bmV4dFRpbWVUb0ZpcmUgPSBzdGQ6Om1pbihuZXh0VGltZVRvRmlyZSwgc2Vjb25kcyk7CiAgICAg ICAgICAgICB9CiAKLSAgICAgICAgICAgIGF1dG8gc2Vjb25kcyA9ICplYXJsaWVzdFRpbWVUb1Nl bmQgLSBub3c7Ci0gICAgICAgICAgICBuZXh0VGltZVRvRmlyZSA9IHN0ZDo6bWluKG5leHRUaW1l VG9GaXJlLCBzZWNvbmRzKTsKLSAgICAgICAgfQotICAgICAgICAKLSAgICAgICAgY2xlYXJTZW50 QXR0cmlidXRpb25zKFdURk1vdmUoc2VudEF0dHJpYnV0aW9ucykpOwotICAgICAgICB1cGRhdGVU aW1lckxhc3RGaXJlZCgpOworICAgICAgICAgICAgY2xlYXJTZW50QXR0cmlidXRpb25zKFdURk1v dmUoc2VudEF0dHJpYnV0aW9ucykpOworICAgICAgICAgICAgdXBkYXRlVGltZXJMYXN0RmlyZWQo KTsKIAotICAgICAgICBpZiAobmV4dFRpbWVUb0ZpcmUgPCBTZWNvbmRzOjppbmZpbml0eSgpKQot ICAgICAgICAgICAgc3RhcnRUaW1lcihuZXh0VGltZVRvRmlyZSk7Ci0gICAgfSk7CisgICAgICAg ICAgICBpZiAobmV4dFRpbWVUb0ZpcmUgPCBTZWNvbmRzOjppbmZpbml0eSgpKQorICAgICAgICAg ICAgICAgIHN0YXJ0VGltZXIobmV4dFRpbWVUb0ZpcmUpOworICAgICAgICB9KTsKKyAgICB9CiAj ZW5kaWYKIH0KIAo= 416180 2020-12-14 12:10:19 -0800 2020-12-15 08:54:00 -0800 Patch bug-219860-20201214121019.patch text/plain 7143 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUwZWJlZThmMTUxMThlN2Jl NTBkYzFlYzE5YzUyZDFhOGQzODNhZWIuLjM2OWFjNzVmNGUxYWJmMGM4NWM1ODZmMTA3NTJiYWY3 MWViYmU2OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjAtMTItMTQgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2hUcmFjZXI6 IGNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyBhdCBXZWJLaXQ6IFdURjo6RGV0YWlsOjpDYWxs YWJsZVdyYXBwZXI8V2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVQ ZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcyMjU0 MjA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cywgdGhpcyBzaG91bGQgZml4IGEgY3Jhc2guCisKKyAgICAgICAgbV9uZXR3b3Jr U2Vzc2lvbiBpcyBhIHdlYWtQdHIuIFdlIHNob3VsZCBjaGVjayB0aGF0IHRoZSBvYmplY3QgaXQK KyAgICAgICAgcmVmZXJlbmNlcyBleGlzdHMgYmVmb3JlIHRyeWluZyB0byB1c2UgaXQuCisKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnN0b3Jl VW5hdHRyaWJ1dGVkKToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRN YW5hZ2VyOjphdHRyaWJ1dGUpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJl bWVudE1hbmFnZXI6OmNsZWFyU2VudEF0dHJpYnV0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6OlBy aXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6dXBkYXRlVGltZXJMYXN0RmlyZWQpOgorICAg ICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVQZW5kaW5n QXR0cmlidXRpb25SZXF1ZXN0cyk6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlcjo6Y2xlYXIpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6OmNsZWFyRm9yUmVnaXN0cmFibGVEb21haW4pOgorICAgICAgICAoV2Vi S2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmNsZWFyRXhwaXJlZCk6CisgICAg ICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6dG9TdHJpbmcgY29u c3QpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6Om1h cmtBbGxVbmF0dHJpYnV0ZWRBc0V4cGlyZWRGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYktpdDo6 UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjptYXJrQXR0cmlidXRlZFByaXZhdGVDbGlj a01lYXN1cmVtZW50c0FzRXhwaXJlZEZvclRlc3RpbmcpOgorCiAyMDIwLTEyLTE0ICBDaHJpcyBE dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVByb2Nlc3NdIENyYXNoIHVu ZGVyIEF1ZGlvRGVzdGluYXRpb25Db2NvYTo6c2V0SXNQbGF5aW5nKGJvb2wpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlci5jcHAKaW5kZXggZjUxNDA2M2JmYTJkOTdlMDNjYjQ3ZmU4MDMwNzVmMDU4 MDA2MGIyMi4uMGRkNWFiMmYxYTM0NWZmNjlkM2UyNzU4MjE4MDhmNWM0MmIzZmU2NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVu dE1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApAQCAtNzgsNiArNzgsOSBAQCB2b2lkIFByaXZhdGVD bGlja01lYXN1cmVtZW50TWFuYWdlcjo6c3RvcmVVbmF0dHJpYnV0ZWQoUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnQmJgogICAgIH0KIAogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1Mp CisgICAgaWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgICAgICByZXR1cm47CisKICAgICBpZiAo YXV0byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNl TG9hZFN0YXRpc3RpY3MoKSkKICAgICAgICAgcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+aW5zZXJ0 UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoV1RGTW92ZShhdHRyaWJ1dGlvbiksIFByaXZhdGVDbGlj a01lYXN1cmVtZW50QXR0cmlidXRpb25UeXBlOjpVbmF0dHJpYnV0ZWQpOwogI2VuZGlmCkBAIC0x MTgsNiArMTIxLDkgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnN0YXJ0 VGltZXIoU2Vjb25kcyBzZWNvbmRzKQogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFn ZXI6OmF0dHJpYnV0ZShjb25zdCBTb3VyY2VTaXRlJiBzb3VyY2VTaXRlLCBjb25zdCBBdHRyaWJ1 dGVPblNpdGUmIGF0dHJpYnV0ZU9uU2l0ZSwgQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYmIGF0dHJp YnV0aW9uVHJpZ2dlckRhdGEpCiB7CiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElD UykKKyAgICBpZiAoIW1fbmV0d29ya1Nlc3Npb24pCisgICAgICAgIHJldHVybjsKKwogICAgIGlm IChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3Vy Y2VMb2FkU3RhdGlzdGljcygpKSB7CiAgICAgICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPmF0 dHJpYnV0ZVByaXZhdGVDbGlja01lYXN1cmVtZW50KHNvdXJjZVNpdGUsIGF0dHJpYnV0ZU9uU2l0 ZSwgV1RGTW92ZShhdHRyaWJ1dGlvblRyaWdnZXJEYXRhKSwgW3RoaXNdIChhdXRvIG9wdGlvbmFs U2Vjb25kc1VudGlsU2VuZCkgewogICAgICAgICAgICAgaWYgKG9wdGlvbmFsU2Vjb25kc1VudGls U2VuZCkgewpAQCAtMTk0LDYgKzIwMCw5IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRN YW5hZ2VyOjpmaXJlQ29udmVyc2lvblJlcXVlc3QoY29uc3QgUHJpdmF0ZUNsaWNrTWVhCiB2b2lk IFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Y2xlYXJTZW50QXR0cmlidXRpb25zKFZl Y3RvcjxQcml2YXRlQ2xpY2tNZWFzdXJlbWVudD4mJiBzZW50Q29udmVyc2lvbnMpCiB7CiAjaWYg RU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKKyAgICBpZiAoIW1fbmV0d29ya1Nlc3Np b24pCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0 aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQogICAgICAg ICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5jbGVhclNlbnRBdHRyaWJ1dGlvbnMoV1RGTW92ZShz ZW50Q29udmVyc2lvbnMpKTsKICNlbmRpZgpAQCAtMjAyLDYgKzIxMSw5IEBAIHZvaWQgUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVhclNlbnRBdHRyaWJ1dGlvbnMoVmVjdG9yPFBy aXZhdGVDbGlja01lCiB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6dXBkYXRl VGltZXJMYXN0RmlyZWQoKQogewogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1Mp CisgICAgaWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgICAgICByZXR1cm47CisKICAgICBpZiAo YXV0byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNl TG9hZFN0YXRpc3RpY3MoKSkKICAgICAgICAgcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+dXBkYXRl VGltZXJMYXN0RmlyZWQoKTsKICNlbmRpZgpAQCAtMjEwLDYgKzIyMiw5IEBAIHZvaWQgUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjp1cGRhdGVUaW1lckxhc3RGaXJlZCgpCiB2b2lkIFBy aXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVl c3RzKCkKIHsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQorICAgIGlmICgh bV9uZXR3b3JrU2Vzc2lvbikKKyAgICAgICAgcmV0dXJuOworCiAgICAgYXV0byogcmVzb3VyY2VM b2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3Mo KTsKICAgICBpZiAoIXJlc291cmNlTG9hZFN0YXRpc3RpY3MpCiAgICAgICAgIHJldHVybjsKQEAg LTI1MCw2ICsyNjUsOSBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Y2xl YXIoKQogICAgIG1fZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVlc3RzVGltZXIuc3RvcCgpOwog CiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKKyAgICBpZiAoIW1fbmV0d29y a1Nlc3Npb24pCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRT dGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQog ICAgICAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5jbGVhclByaXZhdGVDbGlja01lYXN1cmVt ZW50KCk7CiAjZW5kaWYKQEAgLTI1OCw2ICsyNzYsOSBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlcjo6Y2xlYXIoKQogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFn ZXI6OmNsZWFyRm9yUmVnaXN0cmFibGVEb21haW4oY29uc3QgUmVnaXN0cmFibGVEb21haW4mIGRv bWFpbikKIHsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQorICAgIGlmICgh bV9uZXR3b3JrU2Vzc2lvbikKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKGF1dG8qIHJlc291 cmNlTG9hZFN0YXRpc3RpY3MgPSBtX25ldHdvcmtTZXNzaW9uLT5yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzKCkpCiAgICAgICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPmNsZWFyUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRGb3JSZWdpc3RyYWJsZURvbWFpbihkb21haW4pOwogI2VuZGlmCkBAIC0yNjYs NiArMjg3LDkgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmNsZWFyRm9y UmVnaXN0cmFibGVEb21haW4oY29uc3QgUmVnaXN0cmFibGUKIHZvaWQgUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRNYW5hZ2VyOjpjbGVhckV4cGlyZWQoKQogewogI2lmIEVOQUJMRShSRVNPVVJDRV9M T0FEX1NUQVRJU1RJQ1MpCisgICAgaWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgICAgICByZXR1 cm47CisKICAgICBpZiAoYXV0byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nl c3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSkKICAgICAgICAgcmVzb3VyY2VMb2FkU3Rh dGlzdGljcy0+Y2xlYXJFeHBpcmVkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoKTsKICNlbmRpZgpA QCAtMjc0LDYgKzI5OCw5IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpj bGVhckV4cGlyZWQoKQogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnRvU3Ry aW5nKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nKT4mJiBjb21wbGV0aW9uSGFuZGxlcikg Y29uc3QKIHsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQorICAgIGlmICgh bV9uZXR3b3JrU2Vzc2lvbikKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKGF1dG8qIHJlc291 cmNlTG9hZFN0YXRpc3RpY3MgPSBtX25ldHdvcmtTZXNzaW9uLT5yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzKCkpCiAgICAgICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPnByaXZhdGVDbGlja01lYXN1 cmVtZW50VG9TdHJpbmcoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogI2VuZGlmCkBAIC0y OTAsNiArMzE3LDkgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnNldENv bnZlcnNpb25VUkxGb3JUZXN0aW5nKFVSTCYmIHRlc3RVUkwpCiB2b2lkIFByaXZhdGVDbGlja01l YXN1cmVtZW50TWFuYWdlcjo6bWFya0FsbFVuYXR0cmlidXRlZEFzRXhwaXJlZEZvclRlc3Rpbmco KQogewogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCisgICAgaWYgKCFtX25l dHdvcmtTZXNzaW9uKQorICAgICAgICByZXR1cm47CisKICAgICBpZiAoYXV0byogcmVzb3VyY2VM b2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3Mo KSkKICAgICAgICAgcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+bWFya0FsbFVuYXR0cmlidXRlZFBy aXZhdGVDbGlja01lYXN1cmVtZW50QXNFeHBpcmVkRm9yVGVzdGluZygpOwogI2VuZGlmCkBAIC0z MDgsNiArMzM4LDkgQEAgYm9vbCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmRlYnVn TW9kZUVuYWJsZWQoKSBjb25zdAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6 Om1hcmtBdHRyaWJ1dGVkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRzQXNFeHBpcmVkRm9yVGVzdGlu ZyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAjaWYg RU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKKyAgICBpZiAoIW1fbmV0d29ya1Nlc3Np b24pCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0 aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKSB7CiAgICAg ICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPm1hcmtBdHRyaWJ1dGVkUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRzQXNFeHBpcmVkRm9yVGVzdGluZyhXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7 CiAgICAgICAgIHJldHVybjsK 416253 2020-12-15 08:54:03 -0800 2020-12-15 10:28:22 -0800 Patch bug-219860-20201215085402.patch text/plain 7611 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVhMDVkMjU0OGUyZTU3MzNh MzViMDgyMjFjOGRmODMwYmExMjc5MjEuLmMyN2VmN2QwZTg5YzBlM2JjNWRlOWVkYTAzODc0YTNm NmJjN2NiOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMTItMTUgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2hUcmFjZXI6 IGNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyBhdCBXZWJLaXQ6IFdURjo6RGV0YWlsOjpDYWxs YWJsZVdyYXBwZXI8V2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVQ ZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcyMjU0 MjA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZv bGxvd3VwIHBhdGNoIHRvIGFkZCBtaXNzaW5nIGNvbXBsZXRpb24gaGFuZGxlcnMuIFRoaXMgYWxz byBtb3ZlcyB0aGUKKyAgICAgICAgY2hlY2sgZm9yIGEgbnVsbCBtX25ldHdvcmtTZXNzaW9uIHZh cmlhYmxlIHRvIHRoZSBleGlzdGluZyAKKyAgICAgICAgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRN YW5hZ2VyOjpmZWF0dXJlRW5hYmxlZCgpIGZ1bmN0aW9uIGZvcgorICAgICAgICBzaW1wbGljaXR5 LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2Vy OjpzdG9yZVVuYXR0cmlidXRlZCk6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlcjo6YXR0cmlidXRlKToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVhclNlbnRBdHRyaWJ1dGlvbnMpOgorICAgICAgICAoV2Vi S2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnVwZGF0ZVRpbWVyTGFzdEZpcmVk KToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpmaXJl UGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudE1hbmFnZXI6OmNsZWFyKToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVhckZvclJlZ2lzdHJhYmxlRG9tYWluKToKKyAgICAg ICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVhckV4cGlyZWQp OgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnRvU3Ry aW5nIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyOjptYXJrQWxsVW5hdHRyaWJ1dGVkQXNFeHBpcmVkRm9yVGVzdGluZyk6CisgICAgICAgIChX ZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZmVhdHVyZUVuYWJsZWQgY29u c3QpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6Om1h cmtBdHRyaWJ1dGVkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRzQXNFeHBpcmVkRm9yVGVzdGluZyk6 CisKIDIwMjAtMTItMTUgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFttYWNPU10gQWRkIHNhbmRib3ggcGFyYW1ldGVyIGZvciBtZXNzYWdlIGZpbHRlciBl bnRpdGxlbWVudCBzdGF0dXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcAppbmRleCAwZGQ1 YWIyZjFhMzQ1ZmY2OWQzZTI3NTgyMTgwOGY1YzQyYjNmZTY1Li5mYmQ1NGI4NGIwYTc5NTEyYmJm NWRiMzc4ZmVhZDFmZjg3NTBlMmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwCkBA IC03OCw5ICs3OCw2IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpzdG9y ZVVuYXR0cmlidXRlZChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCYmCiAgICAgfQogCiAjaWYgRU5B QkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKLSAgICBpZiAoIW1fbmV0d29ya1Nlc3Npb24p Ci0gICAgICAgIHJldHVybjsKLQogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNz ID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQogICAgICAgICBy ZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5pbnNlcnRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChXVEZN b3ZlKGF0dHJpYnV0aW9uKSwgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRBdHRyaWJ1dGlvblR5cGU6 OlVuYXR0cmlidXRlZCk7CiAjZW5kaWYKQEAgLTEyMSw3ICsxMTgsNyBAQCB2b2lkIFByaXZhdGVD bGlja01lYXN1cmVtZW50TWFuYWdlcjo6c3RhcnRUaW1lcihTZWNvbmRzIHNlY29uZHMpCiB2b2lk IFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6YXR0cmlidXRlKGNvbnN0IFNvdXJjZVNp dGUmIHNvdXJjZVNpdGUsIGNvbnN0IEF0dHJpYnV0ZU9uU2l0ZSYgYXR0cmlidXRlT25TaXRlLCBB dHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYgYXR0cmlidXRpb25UcmlnZ2VyRGF0YSkKIHsKICNpZiBF TkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQotICAgIGlmICghbV9uZXR3b3JrU2Vzc2lv bikKKyAgICBpZiAoIWZlYXR1cmVFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlm IChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3Vy Y2VMb2FkU3RhdGlzdGljcygpKSB7CkBAIC0yMDAsNyArMTk3LDcgQEAgdm9pZCBQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVDb252ZXJzaW9uUmVxdWVzdChjb25zdCBQcml2YXRl Q2xpY2tNZWEKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVhclNlbnRB dHRyaWJ1dGlvbnMoVmVjdG9yPFByaXZhdGVDbGlja01lYXN1cmVtZW50PiYmIHNlbnRDb252ZXJz aW9ucykKIHsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQotICAgIGlmICgh bV9uZXR3b3JrU2Vzc2lvbikKKyAgICBpZiAoIWZlYXR1cmVFbmFibGVkKCkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3Jr U2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQpAQCAtMjExLDcgKzIwOCw3IEBAIHZv aWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVhclNlbnRBdHRyaWJ1dGlvbnMo VmVjdG9yPFByaXZhdGVDbGlja01lCiB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdl cjo6dXBkYXRlVGltZXJMYXN0RmlyZWQoKQogewogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NU QVRJU1RJQ1MpCi0gICAgaWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgIGlmICghZmVhdHVyZUVu YWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGF1dG8qIHJlc291cmNlTG9hZFN0 YXRpc3RpY3MgPSBtX25ldHdvcmtTZXNzaW9uLT5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkpCkBA IC0yMjIsNyArMjE5LDcgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnVw ZGF0ZVRpbWVyTGFzdEZpcmVkKCkKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2Vy OjpmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMoKQogewogI2lmIEVOQUJMRShSRVNPVVJD RV9MT0FEX1NUQVRJU1RJQ1MpCi0gICAgaWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgIGlmICgh ZmVhdHVyZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byogcmVzb3VyY2VM b2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3Mo KTsKQEAgLTI2NSw3ICsyNjIsNyBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdl cjo6Y2xlYXIoKQogICAgIG1fZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVlc3RzVGltZXIuc3Rv cCgpOwogCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKLSAgICBpZiAoIW1f bmV0d29ya1Nlc3Npb24pCisgICAgaWYgKCFmZWF0dXJlRW5hYmxlZCgpKQogICAgICAgICByZXR1 cm47CiAKICAgICBpZiAoYXV0byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nl c3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSkKQEAgLTI3Niw3ICsyNzMsNyBAQCB2b2lk IFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Y2xlYXIoKQogdm9pZCBQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudE1hbmFnZXI6OmNsZWFyRm9yUmVnaXN0cmFibGVEb21haW4oY29uc3QgUmVn aXN0cmFibGVEb21haW4mIGRvbWFpbikKIHsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFU SVNUSUNTKQotICAgIGlmICghbV9uZXR3b3JrU2Vzc2lvbikKKyAgICBpZiAoIWZlYXR1cmVFbmFi bGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0 aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQpAQCAt Mjg3LDcgKzI4NCw3IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVh ckZvclJlZ2lzdHJhYmxlRG9tYWluKGNvbnN0IFJlZ2lzdHJhYmxlCiB2b2lkIFByaXZhdGVDbGlj a01lYXN1cmVtZW50TWFuYWdlcjo6Y2xlYXJFeHBpcmVkKCkKIHsKICNpZiBFTkFCTEUoUkVTT1VS Q0VfTE9BRF9TVEFUSVNUSUNTKQotICAgIGlmICghbV9uZXR3b3JrU2Vzc2lvbikKKyAgICBpZiAo IWZlYXR1cmVFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChhdXRvKiByZXNv dXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlz dGljcygpKQpAQCAtMjk4LDEyICsyOTUsMTcgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dE1hbmFnZXI6OmNsZWFyRXhwaXJlZCgpCiB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlcjo6dG9TdHJpbmcoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdHJpbmcpPiYmIGNvbXBsZXRp b25IYW5kbGVyKSBjb25zdAogewogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1Mp Ci0gICAgaWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgIGlmICghZmVhdHVyZUVuYWJsZWQoKSkg eworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigiXG5ObyBzdG9yZWQgUHJpdmF0ZSBDbGljayBN ZWFzdXJlbWVudCBkYXRhLlxuIl9zKTsKICAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAgIGlm IChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3Vy Y2VMb2FkU3RhdGlzdGljcygpKQorICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNz ID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKSB7CiAgICAgICAg IHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPnByaXZhdGVDbGlja01lYXN1cmVtZW50VG9TdHJpbmco V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgICAgICByZXR1cm47CisgICAgfQogI2Vu ZGlmCisgICAgY29tcGxldGlvbkhhbmRsZXIoIlxuTm8gc3RvcmVkIFByaXZhdGUgQ2xpY2sgTWVh c3VyZW1lbnQgZGF0YS5cbiJfcyk7CiB9CiAKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRN YW5hZ2VyOjpzZXRDb252ZXJzaW9uVVJMRm9yVGVzdGluZyhVUkwmJiB0ZXN0VVJMKQpAQCAtMzE3 LDcgKzMxOSw3IEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpzZXRDb252 ZXJzaW9uVVJMRm9yVGVzdGluZyhVUkwmJiB0ZXN0VVJMKQogdm9pZCBQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6Om1hcmtBbGxVbmF0dHJpYnV0ZWRBc0V4cGlyZWRGb3JUZXN0aW5nKCkK IHsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQotICAgIGlmICghbV9uZXR3 b3JrU2Vzc2lvbikKKyAgICBpZiAoIWZlYXR1cmVFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsK IAogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lv bi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQpAQCAtMzI3LDcgKzMyOSw3IEBAIHZvaWQgUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjptYXJrQWxsVW5hdHRyaWJ1dGVkQXNFeHBpcmVk Rm9yVGVzdGluZygpCiAKIGJvb2wgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpmZWF0 dXJlRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fbmV0d29ya1Byb2Nlc3MtPnByaXZh dGVDbGlja01lYXN1cmVtZW50RW5hYmxlZCgpICYmICFtX3Nlc3Npb25JRC5pc0VwaGVtZXJhbCgp OworICAgIHJldHVybiBtX25ldHdvcmtTZXNzaW9uICYmIG1fbmV0d29ya1Byb2Nlc3MtPnByaXZh dGVDbGlja01lYXN1cmVtZW50RW5hYmxlZCgpICYmICFtX3Nlc3Npb25JRC5pc0VwaGVtZXJhbCgp OwogfQogCiBib29sIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZGVidWdNb2RlRW5h YmxlZCgpIGNvbnN0CkBAIC0zMzgsOCArMzQwLDEwIEBAIGJvb2wgUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnRNYW5hZ2VyOjpkZWJ1Z01vZGVFbmFibGVkKCkgY29uc3QKIHZvaWQgUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyOjptYXJrQXR0cmlidXRlZFByaXZhdGVDbGlja01lYXN1cmVtZW50 c0FzRXhwaXJlZEZvclRlc3RpbmcoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQogewogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCi0gICAg aWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgIGlmICghZmVhdHVyZUVuYWJsZWQoKSkgeworICAg ICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAg aWYgKGF1dG8qIHJlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBtX25ldHdvcmtTZXNzaW9uLT5yZXNv dXJjZUxvYWRTdGF0aXN0aWNzKCkpIHsKICAgICAgICAgcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+ bWFya0F0dHJpYnV0ZWRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudHNBc0V4cGlyZWRGb3JUZXN0aW5n KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsK