210331 2020-04-10 03:41:16 -0700 [EME][GStreamer] remove m_cdmInstance ASSERT in cdmInstanceDetached 2020-04-13 03:18:34 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cturner cturner bugs-noreply calvaris cgarcia eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez oldest_to_newest 1640105 0 cturner 2020-04-10 03:41:16 -0700 [EME][GStreamer] remove m_cdmInstance ASSERT in cdmInstanceDetached 1640124 1 396074 cturner 2020-04-10 05:08:33 -0700 Created attachment 396074 Patch 1640161 2 396081 cturner 2020-04-10 07:40:13 -0700 Created attachment 396081 Patch 1640171 3 396081 calvaris 2020-04-10 08:10:16 -0700 Comment on attachment 396081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396081&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:-3788 > - if (m_cdmInstance != &instance) { > - GST_WARNING("passed CDMInstance %p is different from stored one %p", &instance, m_cdmInstance.get()); > - ASSERT_NOT_REACHED(); > - return; > - } I would still add this check inside the if, or even better, I would just bail out if (!m_cdmInstance). 1640815 4 396261 cturner 2020-04-13 02:50:10 -0700 Created attachment 396261 Patch 1640817 5 396262 cturner 2020-04-13 02:52:16 -0700 Created attachment 396262 Patch Manually add the reviewer field 1640825 6 ews-feeder 2020-04-13 03:18:33 -0700 Committed r260001: <https://trac.webkit.org/changeset/260001> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396262. 396074 2020-04-10 05:08:33 -0700 2020-04-10 07:40:09 -0700 Patch bug-210331-20200410130832.patch text/plain 2799 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFiZjkxNzMyMmI1ODNl MmFjYmZkNWI5ZWIxMGQ5YWVlYjlkM2RjNi4uN2YyNjUyMGJjNTE0ZDAyNDBiMjdhZjE4NjAyMTdh Y2MyODMwNWJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTEwICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXVtHU3RyZWFt ZXJdIHJlbW92ZSBtX2NkbUluc3RhbmNlIEFTU0VSVCBpbiBjZG1JbnN0YW5jZURldGFjaGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAzMzEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0ZXN0cyB0 aGF0IHJlc2V0IHRoZSBzcmMgdmVyeSBxdWlja2x5LCB0aGUgTWVkaWFLZXlzIGNhbiBiZQorICAg ICAgICBpbnN0YWxsZWQgYW5kIHRoZW4gdGhlIHNyYyBpcyByZXNldCBiZWZvcmUgYW4gYXR0YWNo bWVudCBtZXNzYWdlCisgICAgICAgIGlzIHNlbnQuIEhlbmNlLCBkZXRhY2htZW50IGNhbiByZXN1 bHQgaW4gbm8gQ0RNIGN1cnJlbnRseQorICAgICAgICBleGlzdGluZy4KKworICAgICAgICBDb3Zl cmVkIGJ5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQpOgorCiAyMDIwLTA0LTA5ICBDaGFybGllIFR1cm5l ciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRU1FXVtHU3RyZWFtZXJdIFJlbGF4 IHByb3h5IGluaXRpYWxpemF0aW9uIGFzc2VydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA3NDk4ZTcyMTczZDA3YjYzMzQxMTU5NzU3YTFl Y2EzYjdkN2E2MjFkLi40YjY2MGU2ZjY5MGE4MjE4NDE1MzdkMmNiODA1NWQwOTgzY2M2YjM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAt Mzc3NywyMyArMzc3NywxNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2Rt SW5zdGFuY2VBdHRhY2hlZChDRE1JbnN0YW5jZSYgaW5zdGFuY2UpCiAgICAgbV9jZG1BdHRhY2ht ZW50Q29uZGl0aW9uLm5vdGlmeUFsbCgpOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6Y2RtSW5zdGFuY2VEZXRhY2hlZChDRE1JbnN0YW5jZSYgaW5zdGFuY2UpCit2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VEZXRhY2hlZChDRE1JbnN0 YW5jZSYpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLQotICAgIGlmIChtX2NkbUlu c3RhbmNlICE9ICZpbnN0YW5jZSkgewotICAgICAgICBHU1RfV0FSTklORygicGFzc2VkIENETUlu c3RhbmNlICVwIGlzIGRpZmZlcmVudCBmcm9tIHN0b3JlZCBvbmUgJXAiLCAmaW5zdGFuY2UsIG1f Y2RtSW5zdGFuY2UuZ2V0KCkpOwotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLQogICAgIEFTU0VSVChtX3BpcGVsaW5lKTsKIAotICAgIEdTVF9E RUJVR19PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgImRldGFjaGluZyBDRE0gaW5zdGFuY2UgJXAs IHNldHRpbmcgZW1wdHkgY29udGV4dCIsIG1fY2RtSW5zdGFuY2UuZ2V0KCkpOwotICAgIG1fY2Rt SW5zdGFuY2UgPSBudWxscHRyOwotCi0gICAgR1JlZlB0cjxHc3RDb250ZXh0PiBjb250ZXh0ID0g YWRvcHRHUmVmKGdzdF9jb250ZXh0X25ldygiZHJtLWNkbS1wcm94eSIsIEZBTFNFKSk7Ci0gICAg Z3N0X2VsZW1lbnRfc2V0X2NvbnRleHQoR1NUX0VMRU1FTlQobV9waXBlbGluZS5nZXQoKSksIGNv bnRleHQuZ2V0KCkpOworICAgIGlmIChtX2NkbUluc3RhbmNlKSB7CisgICAgICAgIEdTVF9ERUJV R19PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgImRldGFjaGluZyBDRE0gaW5zdGFuY2UgJXAsIHNl dHRpbmcgZW1wdHkgY29udGV4dCIsIG1fY2RtSW5zdGFuY2UuZ2V0KCkpOworICAgICAgICBtX2Nk bUluc3RhbmNlID0gbnVsbHB0cjsKKyAgICAgICAgR1JlZlB0cjxHc3RDb250ZXh0PiBjb250ZXh0 ID0gYWRvcHRHUmVmKGdzdF9jb250ZXh0X25ldygiZHJtLWNkbS1wcm94eSIsIEZBTFNFKSk7Cisg ICAgICAgIGdzdF9lbGVtZW50X3NldF9jb250ZXh0KEdTVF9FTEVNRU5UKG1fcGlwZWxpbmUuZ2V0 KCkpLCBjb250ZXh0LmdldCgpKTsKKyAgICB9CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjphdHRlbXB0VG9EZWNyeXB0V2l0aEluc3RhbmNlKENETUluc3RhbmNlJiBpbnN0 YW5jZSkK 396081 2020-04-10 07:40:13 -0700 2020-04-13 02:50:06 -0700 Patch bug-210331-20200410154012.patch text/plain 2799 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFiZjkxNzMyMmI1ODNl MmFjYmZkNWI5ZWIxMGQ5YWVlYjlkM2RjNi4uN2YyNjUyMGJjNTE0ZDAyNDBiMjdhZjE4NjAyMTdh Y2MyODMwNWJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTEwICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXVtHU3RyZWFt ZXJdIHJlbW92ZSBtX2NkbUluc3RhbmNlIEFTU0VSVCBpbiBjZG1JbnN0YW5jZURldGFjaGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAzMzEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0ZXN0cyB0 aGF0IHJlc2V0IHRoZSBzcmMgdmVyeSBxdWlja2x5LCB0aGUgTWVkaWFLZXlzIGNhbiBiZQorICAg ICAgICBpbnN0YWxsZWQgYW5kIHRoZW4gdGhlIHNyYyBpcyByZXNldCBiZWZvcmUgYW4gYXR0YWNo bWVudCBtZXNzYWdlCisgICAgICAgIGlzIHNlbnQuIEhlbmNlLCBkZXRhY2htZW50IGNhbiByZXN1 bHQgaW4gbm8gQ0RNIGN1cnJlbnRseQorICAgICAgICBleGlzdGluZy4KKworICAgICAgICBDb3Zl cmVkIGJ5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQpOgorCiAyMDIwLTA0LTA5ICBDaGFybGllIFR1cm5l ciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRU1FXVtHU3RyZWFtZXJdIFJlbGF4 IHByb3h5IGluaXRpYWxpemF0aW9uIGFzc2VydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA3NDk4ZTcyMTczZDA3YjYzMzQxMTU5NzU3YTFl Y2EzYjdkN2E2MjFkLi40YjY2MGU2ZjY5MGE4MjE4NDE1MzdkMmNiODA1NWQwOTgzY2M2YjM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAt Mzc3NywyMyArMzc3NywxNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2Rt SW5zdGFuY2VBdHRhY2hlZChDRE1JbnN0YW5jZSYgaW5zdGFuY2UpCiAgICAgbV9jZG1BdHRhY2ht ZW50Q29uZGl0aW9uLm5vdGlmeUFsbCgpOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6Y2RtSW5zdGFuY2VEZXRhY2hlZChDRE1JbnN0YW5jZSYgaW5zdGFuY2UpCit2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VEZXRhY2hlZChDRE1JbnN0 YW5jZSYpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLQotICAgIGlmIChtX2NkbUlu c3RhbmNlICE9ICZpbnN0YW5jZSkgewotICAgICAgICBHU1RfV0FSTklORygicGFzc2VkIENETUlu c3RhbmNlICVwIGlzIGRpZmZlcmVudCBmcm9tIHN0b3JlZCBvbmUgJXAiLCAmaW5zdGFuY2UsIG1f Y2RtSW5zdGFuY2UuZ2V0KCkpOwotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLQogICAgIEFTU0VSVChtX3BpcGVsaW5lKTsKIAotICAgIEdTVF9E RUJVR19PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgImRldGFjaGluZyBDRE0gaW5zdGFuY2UgJXAs IHNldHRpbmcgZW1wdHkgY29udGV4dCIsIG1fY2RtSW5zdGFuY2UuZ2V0KCkpOwotICAgIG1fY2Rt SW5zdGFuY2UgPSBudWxscHRyOwotCi0gICAgR1JlZlB0cjxHc3RDb250ZXh0PiBjb250ZXh0ID0g YWRvcHRHUmVmKGdzdF9jb250ZXh0X25ldygiZHJtLWNkbS1wcm94eSIsIEZBTFNFKSk7Ci0gICAg Z3N0X2VsZW1lbnRfc2V0X2NvbnRleHQoR1NUX0VMRU1FTlQobV9waXBlbGluZS5nZXQoKSksIGNv bnRleHQuZ2V0KCkpOworICAgIGlmIChtX2NkbUluc3RhbmNlKSB7CisgICAgICAgIEdTVF9ERUJV R19PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgImRldGFjaGluZyBDRE0gaW5zdGFuY2UgJXAsIHNl dHRpbmcgZW1wdHkgY29udGV4dCIsIG1fY2RtSW5zdGFuY2UuZ2V0KCkpOworICAgICAgICBtX2Nk bUluc3RhbmNlID0gbnVsbHB0cjsKKyAgICAgICAgR1JlZlB0cjxHc3RDb250ZXh0PiBjb250ZXh0 ID0gYWRvcHRHUmVmKGdzdF9jb250ZXh0X25ldygiZHJtLWNkbS1wcm94eSIsIEZBTFNFKSk7Cisg ICAgICAgIGdzdF9lbGVtZW50X3NldF9jb250ZXh0KEdTVF9FTEVNRU5UKG1fcGlwZWxpbmUuZ2V0 KCkpLCBjb250ZXh0LmdldCgpKTsKKyAgICB9CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjphdHRlbXB0VG9EZWNyeXB0V2l0aEluc3RhbmNlKENETUluc3RhbmNlJiBpbnN0 YW5jZSkK 396261 2020-04-13 02:50:10 -0700 2020-04-13 02:52:12 -0700 Patch bug-210331-20200413105009.patch text/plain 3595 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFiZjkxNzMyMmI1ODNl MmFjYmZkNWI5ZWIxMGQ5YWVlYjlkM2RjNi4uMTkzYmQ1MWI5NTRjZTA2N2Q2NTlkZjNhZGUxOWQ1 NDQyZTlhZmZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIwLTA0LTEzICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXVtHU3RyZWFt ZXJdIHJlbW92ZSBtX2NkbUluc3RhbmNlIEFTU0VSVCBpbiBjZG1JbnN0YW5jZURldGFjaGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAzMzEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0ZXN0cyB0 aGF0IHJlc2V0IHRoZSBzcmMgdmVyeSBxdWlja2x5LCB0aGUgTWVkaWFLZXlzIGNhbiBiZQorICAg ICAgICBpbnN0YWxsZWQgYW5kIHRoZW4gdGhlIHNyYyBpcyByZXNldCBiZWZvcmUgYW4gYXR0YWNo bWVudCBtZXNzYWdlCisgICAgICAgIGlzIHNlbnQuIEhlbmNlLCBkZXRhY2htZW50IGNhbiByZXN1 bHQgaW4gbm8gQ0RNIGN1cnJlbnRseQorICAgICAgICBleGlzdGluZy4KKworICAgICAgICBDb3Zl cmVkIGJ5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQpOiBPbmx5CisgICAgICAgIGFzc2VydCBpZiB0aGUg Q0RNIGluc3RhbmNlIGhhcyBiZWVuIHNldCBiZWZvcmUgZGV0YWNobWVudC4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6YXR0ZW1wdFRvRGVjcnlwdFdpdGhJ bnN0YW5jZSk6CisgICAgICAgIERvIG5vdCBuZWVkIHRoZSAuZ2V0KCksIHRoZSBvcGVyYXRvcj09 IG92ZXJsb2FkIGluIFJlZlB0ciBkb2VzCisgICAgICAgIHRoaXMgZm9yIHVzLCBhbmQgaXQgbWFr ZXMgdGhlIGNvZGUgbW9yZSBjb25zaXN0ZW50LgorCisyMDIwLTA0LTEwICBDaGFybGllIFR1cm5l ciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXVtHU3RyZWFtZXJdIHJlbW92 ZSBtX2NkbUluc3RhbmNlIEFTU0VSVCBpbiBjZG1JbnN0YW5jZURldGFjaGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAzMzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0ZXN0cyB0aGF0IHJlc2V0 IHRoZSBzcmMgdmVyeSBxdWlja2x5LCB0aGUgTWVkaWFLZXlzIGNhbiBiZQorICAgICAgICBpbnN0 YWxsZWQgYW5kIHRoZW4gdGhlIHNyYyBpcyByZXNldCBiZWZvcmUgYW4gYXR0YWNobWVudCBtZXNz YWdlCisgICAgICAgIGlzIHNlbnQuIEhlbmNlLCBkZXRhY2htZW50IGNhbiByZXN1bHQgaW4gbm8g Q0RNIGN1cnJlbnRseQorICAgICAgICBleGlzdGluZy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNk bUluc3RhbmNlRGV0YWNoZWQpOgorCiAyMDIwLTA0LTA5ICBDaGFybGllIFR1cm5lciAgPGN0dXJu ZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRU1FXVtHU3RyZWFtZXJdIFJlbGF4IHByb3h5IGlu aXRpYWxpemF0aW9uIGFzc2VydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcAppbmRleCA3NDk4ZTcyMTczZDA3YjYzMzQxMTU5NzU3YTFlY2EzYjdkN2E2 MjFkLi4zZWI4MjUxNjJkOTU0ZGNhM2E0NzVjODM3MTIwNDEyYWY2MzA4OWYzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMzc4MCwyNSAr Mzc4MCwyMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VB dHRhY2hlZChDRE1JbnN0YW5jZSYgaW5zdGFuY2UpCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6Y2RtSW5zdGFuY2VEZXRhY2hlZChDRE1JbnN0YW5jZSYgaW5zdGFuY2UpCiB7CiAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQobV9waXBlbGluZSk7CiAKLSAg ICBpZiAobV9jZG1JbnN0YW5jZSAhPSAmaW5zdGFuY2UpIHsKLSAgICAgICAgR1NUX1dBUk5JTkco InBhc3NlZCBDRE1JbnN0YW5jZSAlcCBpcyBkaWZmZXJlbnQgZnJvbSBzdG9yZWQgb25lICVwIiwg Jmluc3RhbmNlLCBtX2NkbUluc3RhbmNlLmdldCgpKTsKLSAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgaWYgKCFtX2NkbUluc3RhbmNlKQogICAgICAgICByZXR1cm47Ci0gICAgfQot Ci0gICAgQVNTRVJUKG1fcGlwZWxpbmUpOwogCisgICAgQVNTRVJUKG1fY2RtSW5zdGFuY2UgPT0g Jmluc3RhbmNlKTsKICAgICBHU1RfREVCVUdfT0JKRUNUKG1fcGlwZWxpbmUuZ2V0KCksICJkZXRh Y2hpbmcgQ0RNIGluc3RhbmNlICVwLCBzZXR0aW5nIGVtcHR5IGNvbnRleHQiLCBtX2NkbUluc3Rh bmNlLmdldCgpKTsKICAgICBtX2NkbUluc3RhbmNlID0gbnVsbHB0cjsKLQogICAgIEdSZWZQdHI8 R3N0Q29udGV4dD4gY29udGV4dCA9IGFkb3B0R1JlZihnc3RfY29udGV4dF9uZXcoImRybS1jZG0t cHJveHkiLCBGQUxTRSkpOwogICAgIGdzdF9lbGVtZW50X3NldF9jb250ZXh0KEdTVF9FTEVNRU5U KG1fcGlwZWxpbmUuZ2V0KCkpLCBjb250ZXh0LmdldCgpKTsKIH0KIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmF0dGVtcHRUb0RlY3J5cHRXaXRoSW5zdGFuY2UoQ0RNSW5zdGFu Y2UmIGluc3RhbmNlKQogewotICAgIEFTU0VSVChtX2NkbUluc3RhbmNlLmdldCgpID09ICZpbnN0 YW5jZSk7CisgICAgQVNTRVJUKG1fY2RtSW5zdGFuY2UgPT0gJmluc3RhbmNlKTsKICAgICBHU1Rf VFJBQ0UoImluc3RhbmNlICVwLCBjdXJyZW50IHN0b3JlZCAlcCIsICZpbnN0YW5jZSwgbV9jZG1J bnN0YW5jZS5nZXQoKSk7CiAgICAgYXR0ZW1wdFRvRGVjcnlwdFdpdGhMb2NhbEluc3RhbmNlKCk7 CiB9Cg== 396262 2020-04-13 02:52:16 -0700 2020-04-13 03:18:33 -0700 Patch bug-210331-20200413105215.patch text/plain 2929 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFiZjkxNzMyMmI1ODNl MmFjYmZkNWI5ZWIxMGQ5YWVlYjlkM2RjNi4uMTNmNTVjNGRkNDNiYWNjZjk3NDI2ZGUzYTQ5MWMw ZGQ4MmMwMDJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA0LTEzICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXVtHU3RyZWFt ZXJdIHJlbW92ZSBtX2NkbUluc3RhbmNlIEFTU0VSVCBpbiBjZG1JbnN0YW5jZURldGFjaGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAzMzEKKwor ICAgICAgICBSZXZpZXdlZCBieSBYYWJpZXIgUm9kcmlndWV6LUNhbHZhci4KKworICAgICAgICBJ biB0ZXN0cyB0aGF0IHJlc2V0IHRoZSBzcmMgdmVyeSBxdWlja2x5LCB0aGUgTWVkaWFLZXlzIGNh biBiZQorICAgICAgICBpbnN0YWxsZWQgYW5kIHRoZW4gdGhlIHNyYyBpcyByZXNldCBiZWZvcmUg YW4gYXR0YWNobWVudCBtZXNzYWdlCisgICAgICAgIGlzIHNlbnQuIEhlbmNlLCBkZXRhY2htZW50 IGNhbiByZXN1bHQgaW4gbm8gQ0RNIGN1cnJlbnRseQorICAgICAgICBleGlzdGluZy4KKworICAg ICAgICBDb3ZlcmVkIGJ5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVk LW1lZGlhLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQpOiBPbmx5CisgICAgICAgIGFzc2Vy dCBpZiB0aGUgQ0RNIGluc3RhbmNlIGhhcyBiZWVuIHNldCBiZWZvcmUgZGV0YWNobWVudC4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6YXR0ZW1wdFRvRGVj cnlwdFdpdGhJbnN0YW5jZSk6CisgICAgICAgIERvIG5vdCBuZWVkIHRoZSAuZ2V0KCksIHRoZSBv cGVyYXRvcj09IG92ZXJsb2FkIGluIFJlZlB0ciBkb2VzCisgICAgICAgIHRoaXMgZm9yIHVzLCBh bmQgaXQgbWFrZXMgdGhlIGNvZGUgbW9yZSBjb25zaXN0ZW50LgorCiAyMDIwLTA0LTA5ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRU1FXVtHU3RyZWFt ZXJdIFJlbGF4IHByb3h5IGluaXRpYWxpemF0aW9uIGFzc2VydApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA3NDk4ZTcyMTczZDA3YjYzMzQx MTU5NzU3YTFlY2EzYjdkN2E2MjFkLi4zZWI4MjUxNjJkOTU0ZGNhM2E0NzVjODM3MTIwNDEyYWY2 MzA4OWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcApAQCAtMzc4MCwyNSArMzc4MCwyMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6Y2RtSW5zdGFuY2VBdHRhY2hlZChDRE1JbnN0YW5jZSYgaW5zdGFuY2UpCiB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VEZXRhY2hlZChDRE1JbnN0YW5j ZSYgaW5zdGFuY2UpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQo bV9waXBlbGluZSk7CiAKLSAgICBpZiAobV9jZG1JbnN0YW5jZSAhPSAmaW5zdGFuY2UpIHsKLSAg ICAgICAgR1NUX1dBUk5JTkcoInBhc3NlZCBDRE1JbnN0YW5jZSAlcCBpcyBkaWZmZXJlbnQgZnJv bSBzdG9yZWQgb25lICVwIiwgJmluc3RhbmNlLCBtX2NkbUluc3RhbmNlLmdldCgpKTsKLSAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgaWYgKCFtX2NkbUluc3RhbmNlKQogICAgICAg ICByZXR1cm47Ci0gICAgfQotCi0gICAgQVNTRVJUKG1fcGlwZWxpbmUpOwogCisgICAgQVNTRVJU KG1fY2RtSW5zdGFuY2UgPT0gJmluc3RhbmNlKTsKICAgICBHU1RfREVCVUdfT0JKRUNUKG1fcGlw ZWxpbmUuZ2V0KCksICJkZXRhY2hpbmcgQ0RNIGluc3RhbmNlICVwLCBzZXR0aW5nIGVtcHR5IGNv bnRleHQiLCBtX2NkbUluc3RhbmNlLmdldCgpKTsKICAgICBtX2NkbUluc3RhbmNlID0gbnVsbHB0 cjsKLQogICAgIEdSZWZQdHI8R3N0Q29udGV4dD4gY29udGV4dCA9IGFkb3B0R1JlZihnc3RfY29u dGV4dF9uZXcoImRybS1jZG0tcHJveHkiLCBGQUxTRSkpOwogICAgIGdzdF9lbGVtZW50X3NldF9j b250ZXh0KEdTVF9FTEVNRU5UKG1fcGlwZWxpbmUuZ2V0KCkpLCBjb250ZXh0LmdldCgpKTsKIH0K IAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmF0dGVtcHRUb0RlY3J5cHRXaXRo SW5zdGFuY2UoQ0RNSW5zdGFuY2UmIGluc3RhbmNlKQogewotICAgIEFTU0VSVChtX2NkbUluc3Rh bmNlLmdldCgpID09ICZpbnN0YW5jZSk7CisgICAgQVNTRVJUKG1fY2RtSW5zdGFuY2UgPT0gJmlu c3RhbmNlKTsKICAgICBHU1RfVFJBQ0UoImluc3RhbmNlICVwLCBjdXJyZW50IHN0b3JlZCAlcCIs ICZpbnN0YW5jZSwgbV9jZG1JbnN0YW5jZS5nZXQoKSk7CiAgICAgYXR0ZW1wdFRvRGVjcnlwdFdp dGhMb2NhbEluc3RhbmNlKCk7CiB9Cg==