214786 2020-07-25 10:01:13 -0700 Add null checks in ResourceLoader 2020-07-28 09:31:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez ews-watchlist ggaren japhet webkit-bug-importer youennf oldest_to_newest 1675009 0 achristensen 2020-07-25 10:01:13 -0700 Add null checks in ResourceLoader 1675010 1 405229 achristensen 2020-07-25 10:07:13 -0700 Created attachment 405229 Patch 1675013 2 405230 achristensen 2020-07-25 11:32:37 -0700 Created attachment 405230 Patch 1675015 3 achristensen 2020-07-25 12:18:33 -0700 Well it doesn't crash any more, but it doesn't finish loading. It prints this out: /Users/.../Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm(258) : void WebCore::WebCoreAVFResourceLoader::startLoading() ERROR: Failed to start load for media at url data:audio/mp3;base64,//uQx 1675092 4 ggaren 2020-07-26 09:09:51 -0700 Ews failure looks real 1675522 5 405343 achristensen 2020-07-27 23:48:07 -0700 Created attachment 405343 Patch 1675617 6 405343 youennf 2020-07-28 08:53:44 -0700 Comment on attachment 405343 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405343&action=review > Source/WebCore/ChangeLog:12 > + The original patch for this has a test that would reach this code, but it never finishes loading. Can we do an API test and use a timer to conclude the test (and verify it does not hit some debug assert for instance)? > Source/WebCore/loader/ResourceLoader.cpp:126 > + if (!m_documentLoader || !m_documentLoader->frame()) { Can we keep ASSERT(m_documentLoader)? 1675633 7 405343 achristensen 2020-07-28 09:15:58 -0700 Comment on attachment 405343 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405343&action=review >> Source/WebCore/ChangeLog:12 >> + The original patch for this has a test that would reach this code, but it never finishes loading. > > Can we do an API test and use a timer to conclude the test (and verify it does not hit some debug assert for instance)? I tried that. It didn't trigger the crash before the change. I spent lots of time looking into it. >> Source/WebCore/loader/ResourceLoader.cpp:126 >> + if (!m_documentLoader || !m_documentLoader->frame()) { > > Can we keep ASSERT(m_documentLoader)? No, that would be an invalid assertion. m_documentLoader can be null here. 1675643 8 ews-feeder 2020-07-28 09:30:39 -0700 Committed r264990: <https://trac.webkit.org/changeset/264990> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405343. 1675644 9 webkit-bug-importer 2020-07-28 09:31:20 -0700 <rdar://problem/66221634> 405229 2020-07-25 10:07:13 -0700 2020-07-25 11:32:35 -0700 Patch bug-214786-20200725100712.patch text/plain 4805 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NDg4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA3LTI1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIG51bGwg Y2hlY2tzIGluIFJlc291cmNlTG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTQ3ODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYxMTA2Njg1 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhh ZCBhZGRlZCBzb21lIGlPUy1vbmx5IGNoZWNrcyBiYXNlZCBvbiBjcmFzaCB0cmFjZXIgZGF0YS4K KyAgICAgICAgSXQgdHVybnMgb3V0IHRoZXNlIGNvZGUgcGF0aHMgYXJlIGluZGVlZCByZWFjaGFi bGUuICBMZXQncyBtYWtlIFJlc291cmNlTG9hZGVyIGxlc3MgcGxhdGZvcm0tZGVwZW5kZW50Lgor CisgICAgICAgIFRlc3Q6IGZhc3QvbG9hZGVyL25vLWxvYWRlci13aGVuLWluaXRpYWxpemluZy5o dG1sCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VMb2FkZXI6OmluaXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VM b2FkZXI6OmNhbmNlbCk6CisKIDIwMjAtMDctMjQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIFRocm93IGFub3RoZXIgb25lIG9uIHRoZSBwaWxlIHRha2UgMi4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24g MjY0ODc5KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTIzLDI5ICsxMjMsMTcgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6cmVs ZWFzZVJlc291cmNlcygpCiAKIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmluaXQoUmVzb3VyY2VSZXF1 ZXN0JiYgY2xpZW50UmVxdWVzdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21w bGV0aW9uSGFuZGxlcikKIHsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGlmICghbV9k b2N1bWVudExvYWRlcikgewotICAgICAgICAvLyBXZSBzaG91bGQgYWx3YXlzIGhhdmUgYSBEb2N1 bWVudExvYWRlciBhdCB0aGlzIHBvaW50LCBidXQgY3Jhc2ggcmVwb3J0cyBpbmRpY2F0ZSB0aGF0 IGl0IGlzIHNvbWV0aW1lcyBudWxsLgotICAgICAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzM2MAotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICBpZiAoIW1fZG9jdW1lbnRMb2FkZXIgfHwgbV9kb2N1bWVudExvYWRlci0+ZnJhbWUo KSkgeworICAgICAgICBjYW5jZWwoKTsKICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVy KGZhbHNlKTsKICAgICB9Ci0jZW5kaWYKKwogICAgIEFTU0VSVCghbV9oYW5kbGUpOwogICAgIEFT U0VSVChtX3JlcXVlc3QuaXNOdWxsKCkpOwogICAgIEFTU0VSVChtX2RlZmVycmVkUmVxdWVzdC5p c051bGwoKSk7CiAgICAgQVNTRVJUKCFtX2RvY3VtZW50TG9hZGVyLT5pc1N1YnN0aXR1dGVMb2Fk UGVuZGluZyh0aGlzKSk7CiAgICAgCiAgICAgbV9sb2FkVGltaW5nLm1hcmtTdGFydFRpbWVBbmRG ZXRjaFN0YXJ0KCk7Ci0KLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIC8vIElmIHRoZSBk b2N1bWVudExvYWRlciB3YXMgZGV0YWNoZWQgd2hpbGUgdGhpcyBSZXNvdXJjZUxvYWRlciB3YXMg d2FpdGluZyBpdHMgdHVybgotICAgIC8vIGluIFJlc291cmNlTG9hZFNjaGVkdWxlciBxdWV1ZSwg ZG9uJ3QgY29udGludWUuCi0gICAgaWYgKCFtX2RvY3VtZW50TG9hZGVyLT5mcmFtZSgpKSB7Ci0g ICAgICAgIGNhbmNlbCgpOwotICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoZmFsc2Up OwotICAgIH0KLSNlbmRpZgogICAgIAogICAgIG1fZGVmZXJzTG9hZGluZyA9IG1fb3B0aW9ucy5k ZWZlcnNMb2FkaW5nUG9saWN5ID09IERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9h ZGluZyAmJiBtX2ZyYW1lLT5wYWdlKCktPmRlZmVyc0xvYWRpbmcoKTsKIApAQCAtNjQ1LDcgKzYz Myw4IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmNhbmNlbChjb25zdCBSZXNvdXIKICAgICAgICAg aWYgKG1faGFuZGxlKQogICAgICAgICAgICAgbV9oYW5kbGUtPmNsZWFyQXV0aGVudGljYXRpb24o KTsKIAotICAgICAgICBtX2RvY3VtZW50TG9hZGVyLT5jYW5jZWxQZW5kaW5nU3Vic3RpdHV0ZUxv YWQodGhpcyk7CisgICAgICAgIGlmIChtX2RvY3VtZW50TG9hZGVyKQorICAgICAgICAgICAgbV9k b2N1bWVudExvYWRlci0+Y2FuY2VsUGVuZGluZ1N1YnN0aXR1dGVMb2FkKHRoaXMpOwogICAgICAg ICBpZiAobV9oYW5kbGUpIHsKICAgICAgICAgICAgIG1faGFuZGxlLT5jYW5jZWwoKTsKICAgICAg ICAgICAgIG1faGFuZGxlID0gbnVsbHB0cjsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NDg4MCkKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisy MDIwLTA3LTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisK KyAgICAgICAgQWRkIG51bGwgY2hlY2tzIGluIFJlc291cmNlTG9hZGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ3ODYKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzYxMTA2Njg1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogZmFzdC9sb2FkZXIvbm8tbG9hZGVyLXdoZW4taW5pdGlhbGl6aW5nLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2FkZXIvbm8tbG9hZGVyLXdoZW4t aW5pdGlhbGl6aW5nLmh0bWw6IEFkZGVkLgorCiAyMDIwLTA3LTI0ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTnVsbCBjaGVjayBmcmFtZSBp biBEb2N1bWVudDo6ZGlzcGF0Y2hEaXNhYmxlZEFkYXB0YXRpb25zRGlkQ2hhbmdlRm9yTWFpbkZy YW1lIGFuZCBhIGZldyBvdGhlciBwbGFjZXMKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbG9hZGVy L25vLWxvYWRlci13aGVuLWluaXRpYWxpemluZy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvbm8tbG9hZGVyLXdoZW4taW5pdGlhbGl6aW5nLWV4cGVj dGVkLnR4dAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9uby1sb2Fk ZXItd2hlbi1pbml0aWFsaXppbmctZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAg KzEsNSBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAs MCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxv Y2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0 ICg4LDgpIHNpemUgNzg0eDU4NApJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvbm8tbG9h ZGVyLXdoZW4taW5pdGlhbGl6aW5nLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFz dC9sb2FkZXIvbm8tbG9hZGVyLXdoZW4taW5pdGlhbGl6aW5nLmh0bWwJKG5vbmV4aXN0ZW50KQor KysgTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvbm8tbG9hZGVyLXdoZW4taW5pdGlhbGl6aW5nLmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxNiBAQAorPHNjcmlwdD4KKyAgICBmdW5jdGlv biBib2R5TG9hZGVkKCkgeworICAgICAgICBmb3JtLnN1Ym1pdCgpOworICAgICAgICB2aWRlby5z cmMgPSAiZGF0YTphdWRpby9tcDM7YmFzZTY0LC8vdVF4IjsKKyAgICB9CisgICAgZnVuY3Rpb24g bWV0YWRhdGFMb2FkZWQoKSB7CisgICAgICAgIHdpbmRvdy5zdG9wKCk7CisgICAgICAgIG9iamVj dC50eXBlID0gImFwcGxpY2F0aW9uL3BkZiI7CisgICAgfQorPC9zY3JpcHQ+Cis8Ym9keSBvbmxv YWQ9Ym9keUxvYWRlZCgpPgorPG9iamVjdCBpZD0ib2JqZWN0IiBkYXRhPSJhYmMiIHNob3VsZGZv Y3VzPSJmYWxzZSIgZHJhZ2dhYmxlPSJ0cnVlIiBzaG91bGRmb2N1cz0idHJ1ZSI+Cis8dmlkZW8g aWQ9InZpZGVvIiBvbmxvYWRlZG1ldGFkYXRhPSJtZXRhZGF0YUxvYWRlZCgpIiBzcmM9IngiPgor PGZvcm0gaWQ9ImZvcm0iPgorPC9ib2R5PgorPCEtLSB0aGlzIHRlc3QgcGFzc2VzIGlmIGl0IGRv ZXMgbm90IGNyYXNoIC0tPgo= 405230 2020-07-25 11:32:37 -0700 2020-07-27 23:48:06 -0700 Patch bug-214786-20200725113236.patch text/plain 4806 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NDg4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA3LTI1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIG51bGwg Y2hlY2tzIGluIFJlc291cmNlTG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTQ3ODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYxMTA2Njg1 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhh ZCBhZGRlZCBzb21lIGlPUy1vbmx5IGNoZWNrcyBiYXNlZCBvbiBjcmFzaCB0cmFjZXIgZGF0YS4K KyAgICAgICAgSXQgdHVybnMgb3V0IHRoZXNlIGNvZGUgcGF0aHMgYXJlIGluZGVlZCByZWFjaGFi bGUuICBMZXQncyBtYWtlIFJlc291cmNlTG9hZGVyIGxlc3MgcGxhdGZvcm0tZGVwZW5kZW50Lgor CisgICAgICAgIFRlc3Q6IGZhc3QvbG9hZGVyL25vLWxvYWRlci13aGVuLWluaXRpYWxpemluZy5o dG1sCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VMb2FkZXI6OmluaXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VM b2FkZXI6OmNhbmNlbCk6CisKIDIwMjAtMDctMjQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIFRocm93IGFub3RoZXIgb25lIG9uIHRoZSBwaWxlIHRha2UgMi4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24g MjY0ODc5KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTIzLDI5ICsxMjMsMTcgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6cmVs ZWFzZVJlc291cmNlcygpCiAKIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmluaXQoUmVzb3VyY2VSZXF1 ZXN0JiYgY2xpZW50UmVxdWVzdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21w bGV0aW9uSGFuZGxlcikKIHsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGlmICghbV9k b2N1bWVudExvYWRlcikgewotICAgICAgICAvLyBXZSBzaG91bGQgYWx3YXlzIGhhdmUgYSBEb2N1 bWVudExvYWRlciBhdCB0aGlzIHBvaW50LCBidXQgY3Jhc2ggcmVwb3J0cyBpbmRpY2F0ZSB0aGF0 IGl0IGlzIHNvbWV0aW1lcyBudWxsLgotICAgICAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzM2MAotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICBpZiAoIW1fZG9jdW1lbnRMb2FkZXIgfHwgIW1fZG9jdW1lbnRMb2FkZXItPmZyYW1l KCkpIHsKKyAgICAgICAgY2FuY2VsKCk7CiAgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxl cihmYWxzZSk7CiAgICAgfQotI2VuZGlmCisKICAgICBBU1NFUlQoIW1faGFuZGxlKTsKICAgICBB U1NFUlQobV9yZXF1ZXN0LmlzTnVsbCgpKTsKICAgICBBU1NFUlQobV9kZWZlcnJlZFJlcXVlc3Qu aXNOdWxsKCkpOwogICAgIEFTU0VSVCghbV9kb2N1bWVudExvYWRlci0+aXNTdWJzdGl0dXRlTG9h ZFBlbmRpbmcodGhpcykpOwogICAgIAogICAgIG1fbG9hZFRpbWluZy5tYXJrU3RhcnRUaW1lQW5k RmV0Y2hTdGFydCgpOwotCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAvLyBJZiB0aGUg ZG9jdW1lbnRMb2FkZXIgd2FzIGRldGFjaGVkIHdoaWxlIHRoaXMgUmVzb3VyY2VMb2FkZXIgd2Fz IHdhaXRpbmcgaXRzIHR1cm4KLSAgICAvLyBpbiBSZXNvdXJjZUxvYWRTY2hlZHVsZXIgcXVldWUs IGRvbid0IGNvbnRpbnVlLgotICAgIGlmICghbV9kb2N1bWVudExvYWRlci0+ZnJhbWUoKSkgewot ICAgICAgICBjYW5jZWwoKTsKLSAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKGZhbHNl KTsKLSAgICB9Ci0jZW5kaWYKICAgICAKICAgICBtX2RlZmVyc0xvYWRpbmcgPSBtX29wdGlvbnMu ZGVmZXJzTG9hZGluZ1BvbGljeSA9PSBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xv YWRpbmcgJiYgbV9mcmFtZS0+cGFnZSgpLT5kZWZlcnNMb2FkaW5nKCk7CiAKQEAgLTY0NSw3ICs2 MzMsOCBAQCB2b2lkIFJlc291cmNlTG9hZGVyOjpjYW5jZWwoY29uc3QgUmVzb3VyCiAgICAgICAg IGlmIChtX2hhbmRsZSkKICAgICAgICAgICAgIG1faGFuZGxlLT5jbGVhckF1dGhlbnRpY2F0aW9u KCk7CiAKLSAgICAgICAgbV9kb2N1bWVudExvYWRlci0+Y2FuY2VsUGVuZGluZ1N1YnN0aXR1dGVM b2FkKHRoaXMpOworICAgICAgICBpZiAobV9kb2N1bWVudExvYWRlcikKKyAgICAgICAgICAgIG1f ZG9jdW1lbnRMb2FkZXItPmNhbmNlbFBlbmRpbmdTdWJzdGl0dXRlTG9hZCh0aGlzKTsKICAgICAg ICAgaWYgKG1faGFuZGxlKSB7CiAgICAgICAgICAgICBtX2hhbmRsZS0+Y2FuY2VsKCk7CiAgICAg ICAgICAgICBtX2hhbmRsZSA9IG51bGxwdHI7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjQ4ODApCisr KyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAor MjAyMC0wNy0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgor CisgICAgICAgIEFkZCBudWxsIGNoZWNrcyBpbiBSZXNvdXJjZUxvYWRlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0Nzg2CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82MTEwNjY4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGZhc3QvbG9hZGVyL25vLWxvYWRlci13aGVuLWluaXRpYWxpemluZy1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL25vLWxvYWRlci13aGVu LWluaXRpYWxpemluZy5odG1sOiBBZGRlZC4KKwogMjAyMC0wNy0yNCAgQWxleCBDaHJpc3RlbnNl biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIE51bGwgY2hlY2sgZnJhbWUg aW4gRG9jdW1lbnQ6OmRpc3BhdGNoRGlzYWJsZWRBZGFwdGF0aW9uc0RpZENoYW5nZUZvck1haW5G cmFtZSBhbmQgYSBmZXcgb3RoZXIgcGxhY2VzCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2xvYWRl ci9uby1sb2FkZXItd2hlbi1pbml0aWFsaXppbmctZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL25vLWxvYWRlci13aGVuLWluaXRpYWxpemluZy1leHBl Y3RlZC50eHQJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvbm8tbG9h ZGVyLXdoZW4taW5pdGlhbGl6aW5nLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCww ICsxLDUgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3IGF0ICgw LDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlckJs b2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtCT0RZfSBh dCAoOCw4KSBzaXplIDc4NHg1ODQKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL25vLWxv YWRlci13aGVuLWluaXRpYWxpemluZy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zh c3QvbG9hZGVyL25vLWxvYWRlci13aGVuLWluaXRpYWxpemluZy5odG1sCShub25leGlzdGVudCkK KysrIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL25vLWxvYWRlci13aGVuLWluaXRpYWxpemluZy5o dG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTYgQEAKKzxzY3JpcHQ+CisgICAgZnVuY3Rp b24gYm9keUxvYWRlZCgpIHsKKyAgICAgICAgZm9ybS5zdWJtaXQoKTsKKyAgICAgICAgdmlkZW8u c3JjID0gImRhdGE6YXVkaW8vbXAzO2Jhc2U2NCwvL3VReCI7CisgICAgfQorICAgIGZ1bmN0aW9u IG1ldGFkYXRhTG9hZGVkKCkgeworICAgICAgICB3aW5kb3cuc3RvcCgpOworICAgICAgICBvYmpl Y3QudHlwZSA9ICJhcHBsaWNhdGlvbi9wZGYiOworICAgIH0KKzwvc2NyaXB0PgorPGJvZHkgb25s b2FkPWJvZHlMb2FkZWQoKT4KKzxvYmplY3QgaWQ9Im9iamVjdCIgZGF0YT0iYWJjIiBzaG91bGRm b2N1cz0iZmFsc2UiIGRyYWdnYWJsZT0idHJ1ZSIgc2hvdWxkZm9jdXM9InRydWUiPgorPHZpZGVv IGlkPSJ2aWRlbyIgb25sb2FkZWRtZXRhZGF0YT0ibWV0YWRhdGFMb2FkZWQoKSIgc3JjPSJ4Ij4K Kzxmb3JtIGlkPSJmb3JtIj4KKzwvYm9keT4KKzwhLS0gdGhpcyB0ZXN0IHBhc3NlcyBpZiBpdCBk b2VzIG5vdCBjcmFzaCAtLT4K 405343 2020-07-27 23:48:07 -0700 2020-07-28 09:30:39 -0700 Patch bug-214786-20200727234807.patch text/plain 4436 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NDk1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA3LTI3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIG51bGwg Y2hlY2tzIGluIFJlc291cmNlTG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTQ3ODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYxMTA2Njg1 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhh ZCBhZGRlZCBzb21lIGlPUy1vbmx5IGNoZWNrcyBiYXNlZCBvbiBjcmFzaCB0cmFjZXIgZGF0YS4K KyAgICAgICAgSXQgdHVybnMgb3V0IHRoZXNlIGNvZGUgcGF0aHMgYXJlIGluZGVlZCByZWFjaGFi bGUuICBMZXQncyBtYWtlIFJlc291cmNlTG9hZGVyIGxlc3MgcGxhdGZvcm0tZGVwZW5kZW50Lgor CisgICAgICAgIFRoZSBvcmlnaW5hbCBwYXRjaCBmb3IgdGhpcyBoYXMgYSB0ZXN0IHRoYXQgd291 bGQgcmVhY2ggdGhpcyBjb2RlLCBidXQgaXQgbmV2ZXIgZmluaXNoZXMgbG9hZGluZy4KKyAgICAg ICAgUmF0aGVyIHRoYW4gYWRkIGEgdGVzdCB0aGF0IGFsd2F5cyB0aW1lcyBvdXQgb3Igbm90IGNv bW1pdHRpbmcgdGhlIGZpeCwgSSBjb21taXQgdGhlIGZpeCB3aXRob3V0IHRoZSB0ZXN0LgorCisg ICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlTG9hZGVyOjppbml0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjpj YW5jZWwpOgorCiAyMDIwLTA3LTI3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgdGhpc1ZhbHVlIGlzIG5vdCBhbHdheXMgc2V0IGNvcnJlY3RseSB3aGVuIGNhbGxp bmcgSlMgY2FsbGJhY2tzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2Fk ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRl ci5jcHAJKHJldmlzaW9uIDI2NDk1NCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMywyOSArMTIzLDE3IEBAIHZvaWQgUmVz b3VyY2VMb2FkZXI6OnJlbGVhc2VSZXNvdXJjZXMoKQogCiB2b2lkIFJlc291cmNlTG9hZGVyOjpp bml0KFJlc291cmNlUmVxdWVzdCYmIGNsaWVudFJlcXVlc3QsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKLSAgICBpZiAoIW1fZG9jdW1lbnRMb2FkZXIpIHsKLSAgICAgICAgLy8gV2Ugc2hvdWxkIGFs d2F5cyBoYXZlIGEgRG9jdW1lbnRMb2FkZXIgYXQgdGhpcyBwb2ludCwgYnV0IGNyYXNoIHJlcG9y dHMgaW5kaWNhdGUgdGhhdCBpdCBpcyBzb21ldGltZXMgbnVsbC4KLSAgICAgICAgLy8gU2VlIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODczNjAKLSAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgaWYgKCFtX2RvY3VtZW50TG9hZGVyIHx8ICFtX2RvY3Vt ZW50TG9hZGVyLT5mcmFtZSgpKSB7CisgICAgICAgIGNhbmNlbCgpOwogICAgICAgICByZXR1cm4g Y29tcGxldGlvbkhhbmRsZXIoZmFsc2UpOwogICAgIH0KLSNlbmRpZgorCiAgICAgQVNTRVJUKCFt X2hhbmRsZSk7CiAgICAgQVNTRVJUKG1fcmVxdWVzdC5pc051bGwoKSk7CiAgICAgQVNTRVJUKG1f ZGVmZXJyZWRSZXF1ZXN0LmlzTnVsbCgpKTsKICAgICBBU1NFUlQoIW1fZG9jdW1lbnRMb2FkZXIt PmlzU3Vic3RpdHV0ZUxvYWRQZW5kaW5nKHRoaXMpKTsKICAgICAKICAgICBtX2xvYWRUaW1pbmcu bWFya1N0YXJ0VGltZUFuZEZldGNoU3RhcnQoKTsKLQotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp Ci0gICAgLy8gSWYgdGhlIGRvY3VtZW50TG9hZGVyIHdhcyBkZXRhY2hlZCB3aGlsZSB0aGlzIFJl c291cmNlTG9hZGVyIHdhcyB3YWl0aW5nIGl0cyB0dXJuCi0gICAgLy8gaW4gUmVzb3VyY2VMb2Fk U2NoZWR1bGVyIHF1ZXVlLCBkb24ndCBjb250aW51ZS4KLSAgICBpZiAoIW1fZG9jdW1lbnRMb2Fk ZXItPmZyYW1lKCkpIHsKLSAgICAgICAgY2FuY2VsKCk7Ci0gICAgICAgIHJldHVybiBjb21wbGV0 aW9uSGFuZGxlcihmYWxzZSk7Ci0gICAgfQotI2VuZGlmCiAgICAgCiAgICAgbV9kZWZlcnNMb2Fk aW5nID0gbV9vcHRpb25zLmRlZmVyc0xvYWRpbmdQb2xpY3kgPT0gRGVmZXJzTG9hZGluZ1BvbGlj eTo6QWxsb3dEZWZlcnNMb2FkaW5nICYmIG1fZnJhbWUtPnBhZ2UoKS0+ZGVmZXJzTG9hZGluZygp OwogCkBAIC02NDUsNyArNjMzLDggQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6Y2FuY2VsKGNvbnN0 IFJlc291cgogICAgICAgICBpZiAobV9oYW5kbGUpCiAgICAgICAgICAgICBtX2hhbmRsZS0+Y2xl YXJBdXRoZW50aWNhdGlvbigpOwogCi0gICAgICAgIG1fZG9jdW1lbnRMb2FkZXItPmNhbmNlbFBl bmRpbmdTdWJzdGl0dXRlTG9hZCh0aGlzKTsKKyAgICAgICAgaWYgKG1fZG9jdW1lbnRMb2FkZXIp CisgICAgICAgICAgICBtX2RvY3VtZW50TG9hZGVyLT5jYW5jZWxQZW5kaW5nU3Vic3RpdHV0ZUxv YWQodGhpcyk7CiAgICAgICAgIGlmIChtX2hhbmRsZSkgewogICAgICAgICAgICAgbV9oYW5kbGUt PmNhbmNlbCgpOwogICAgICAgICAgICAgbV9oYW5kbGUgPSBudWxscHRyOwpJbmRleDogU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ KHJldmlzaW9uIDI2NDk2NCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDctMjcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgbnVsbCBjaGVja3MgaW4gUmVzb3Vy Y2VMb2FkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNDc4NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjExMDY2ODU+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv UERGL1BERlBsdWdpbi5tbToKKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpnZXRSZXNvdXJj ZUJ5dGVzQXRQb3NpdGlvbik6CisKIDIwMjAtMDctMjcgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5l X2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgSGFuZGxlIGZ1bGwgYnJvd3NlciBhcHBzIHRo YXQgdHJ5IHRvIHVzZSBwcm9oaWJpdGVkIEluZm8ucGxpc3Qgc3RyaW5ncwpJbmRleDogU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCShyZXZp c2lvbiAyNjQ5NTQpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERG UGx1Z2luLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NjQsNiArOTY0LDggQEAgdm9pZCBQREZQbHVn aW46OmdldFJlc291cmNlQnl0ZXNBdFBvc2l0aQogI2VuZGlmCiAKICAgICBXZWJQcm9jZXNzOjpz aW5nbGV0b24oKS53ZWJMb2FkZXJTdHJhdGVneSgpLnNjaGVkdWxlUGx1Z2luU3RyZWFtTG9hZCgq Y29yZUZyYW1lLCAqdGhpcywgV1RGTW92ZShyZXNvdXJjZVJlcXVlc3QpLCBbdGhpcywgcHJvdGVj dGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBpZGVudGlmaWVyXSAoUmVmUHRyPFdlYkNvcmU6Ok5l dHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyPiYmIGxvYWRlcikgeworICAgICAgICBpZiAoIWxvYWRl cikKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgYXV0byBpdGVyYXRvciA9IG1fb3V0c3Rh bmRpbmdCeXRlUmFuZ2VSZXF1ZXN0cy5maW5kKGlkZW50aWZpZXIpOwogICAgICAgICBpZiAoaXRl cmF0b3IgPT0gbV9vdXRzdGFuZGluZ0J5dGVSYW5nZVJlcXVlc3RzLmVuZCgpKSB7CiAgICAgICAg ICAgICBsb2FkZXItPmNhbmNlbChsb2FkZXItPmNhbmNlbGxlZEVycm9yKCkpOwo=