232430 2021-10-28 03:20:41 -0700 Fix potential race in AudioMediaStreamTrackRendererCocoa::pushSamples 2021-10-29 04:00:25 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1809621 0 youennf 2021-10-28 03:20:41 -0700 Fix potential race in AudioMediaStreamTrackRendererCocoa::pushSamples 1809637 1 442693 youennf 2021-10-28 05:25:43 -0700 Created attachment 442693 Patch 1809641 2 442696 youennf 2021-10-28 05:38:00 -0700 Created attachment 442696 Patch 1809684 3 442696 eric.carlson 2021-10-28 08:48:31 -0700 Comment on attachment 442696 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442696&action=review > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:65 > void AudioMediaStreamTrackRendererCocoa::stop() > { > - if (m_dataSource) > - AudioMediaStreamTrackRendererUnit::singleton().removeSource(*m_dataSource); > + if (m_registeredDataSource) > + AudioMediaStreamTrackRendererUnit::singleton().removeSource(*m_registeredDataSource); Should we assert that this is called on the main thread? > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:80 > + if (m_registeredDataSource) > + m_registeredDataSource->setVolume(volume); Ditto > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:97 > +void AudioMediaStreamTrackRendererCocoa::setRegisteredDataSource(RefPtr<AudioSampleDataSource>&& source) > +{ Ditto > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:106 > + if (!m_outputDescription) > + return; > + > + m_registeredDataSource = WTFMove(source); > + if (!m_registeredDataSource) > + return; Shouldn't the order of these be switched so we always update m_registeredDataSource, and e.g. not set it to NULL when there is no source? > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:108 > +#if !RELEASE_LOG_DISABLED RELEASE_LOG_DISABLED is always defined for PLATFORM(COCOA), so I think this is unnecessary. 1810019 4 youennf 2021-10-29 03:03:27 -0700 (In reply to Eric Carlson from comment #3) > Comment on attachment 442696 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=442696&action=review > > > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:65 > > void AudioMediaStreamTrackRendererCocoa::stop() > > { > > - if (m_dataSource) > > - AudioMediaStreamTrackRendererUnit::singleton().removeSource(*m_dataSource); > > + if (m_registeredDataSource) > > + AudioMediaStreamTrackRendererUnit::singleton().removeSource(*m_registeredDataSource); > > Should we assert that this is called on the main thread? OK > > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:80 > > + if (m_registeredDataSource) > > + m_registeredDataSource->setVolume(volume); > > Ditto OK > > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:97 > > +void AudioMediaStreamTrackRendererCocoa::setRegisteredDataSource(RefPtr<AudioSampleDataSource>&& source) > > +{ > > Ditto OK > > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:106 > > + if (!m_outputDescription) > > + return; > > + > > + m_registeredDataSource = WTFMove(source); > > + if (!m_registeredDataSource) > > + return; > > Shouldn't the order of these be switched so we always update > m_registeredDataSource, and e.g. not set it to NULL when there is no source? I think it is good to set m_registeredDataSource to nullptr so that we unregister it only once for instance. And we tentatively destroy it as soon as we no longer need it. > > Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:108 > > +#if !RELEASE_LOG_DISABLED > > RELEASE_LOG_DISABLED is always defined for PLATFORM(COCOA), so I think this > is unnecessary. OK 1810020 5 442801 youennf 2021-10-29 03:05:20 -0700 Created attachment 442801 Patch for landing 1810023 6 ews-feeder 2021-10-29 03:59:42 -0700 Committed r285024 (243668@main): <https://commits.webkit.org/243668@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442801. 1810024 7 webkit-bug-importer 2021-10-29 04:00:25 -0700 <rdar://problem/84803096> 442693 2021-10-28 05:25:43 -0700 2021-10-28 05:37:56 -0700 Patch bug-232430-20211028142542.patch text/plain 7317 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NmZjIwNTAyMmU5ZDRl MDQ1N2Y2MjJmNzMxMmNhYzIwOTc5ZGQ0Yy4uZmQ4YmUxMWI0ZGVjYmM1NzU5ZGM4NThkYTIxYmE1 MTk1NGQ1NDlkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTEwLTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggcG90ZW50aWFsIHJh Y2UgaW4gQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6cHVzaFNhbXBsZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQzMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNhc2Ugd2Ug c3RhcnQgYSBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hLCBhbmQgd2UgcXVpY2ts eSBzdG9wIGl0LCB0aGVyZSBtYXkgYmUgYSB0aW1lCisgICAgICAgIHdoZXJlIHdlIGNyZWF0ZSBh biBBdWRpb1NhbXBsZURhdGFTb3VyY2UgZnJvbSBhIGJhY2tncm91bmQgdGhyZWFkLCB0aGVuIGhv cCB0byBtYWluIHRocmVhZC4KKyAgICAgICAgV2Ugd291bGQgdGhlbiByZWdpc3RlciBpdCB0byB0 aGUgcmVuZGVyaW5nIHVuaXQgZXZlbiBpZiB0aGUgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVy ZXJDb2NvYSBpcyBjbGVhcmVkLgorICAgICAgICBUaGUgQXVkaW9TYW1wbGVEYXRhU291cmNlIHdv dWxkIHRoZW4gYmUga2VwdCByZWdpc3RlcmVkIHdpdGggbm8gZGF0YSB3aGljaCB3b3VsZCBiZSB3 YXN0ZWZ1bCBpbiB0ZXJtcyBvZiBDUFUuCisgICAgICAgIFRvIGZpeCB0aGlzLCB3ZSBrZWVwIG1f ZGF0YVNvdXJjZSBidXQgaW50cm9kdWNlIGEgbV9yZWdpc3RlcmVkRGF0YVNvdXJjZS4KKyAgICAg ICAgbV9yZWdpc3RlcmVkRGF0YVNvdXJjZSBpcyBvbmx5IG1hbmlwdWxhdGVkIGluIG1haW4gdGhy ZWFkIGFuZCBpcyB0aGUgb25lIHRoYXQgaXMgcmVnaXN0ZXJlZC91bnJlZ2lzdGVyZWQgdG8gdGhl IHJlbmRlcmluZyB1bml0LgorICAgICAgICBtX2RhdGFTb3VyY2UgaXMgb25seSBhY2Nlc3NlZCBm cm9tIGJhY2tncm91bmQgdGhyZWFkLgorCisgICAgICAgIE1hbnVhbGx5IHRlc3RlZCBhbmQgY292 ZXJlZCBieSBhZGRlZCBhc3NlcnRpb24gaW4gQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJD b2NvYSBkZXN0cnVjdG9yLgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2Ev QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjp+QXVkaW9NZWRpYVN0cmVhbVRy YWNrUmVuZGVyZXJDb2NvYSk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb01lZGlhU3RyZWFtVHJh Y2tSZW5kZXJlckNvY29hOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb01lZGlhU3Ry ZWFtVHJhY2tSZW5kZXJlckNvY29hOjpzZXRSZWdpc3RlcmVkRGF0YVNvdXJjZSk6CisgICAgICAg IChXZWJDb3JlOjpBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjpwdXNoU2FtcGxl cyk6CisgICAgICAgIChXZWJDb3JlOjpwb2xsU2FtcGxlc0NvdW50KTogRGVsZXRlZC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5k ZXJlckNvY29hLmg6CisKIDIwMjEtMTAtMjggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgogCiAgICAgICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyVW5pdDo6cmVuZGVy IHNob3VsZCBoYW5kbGUgdGhlIGNhc2Ugb2YgZmFpbGluZyB0byBwdWxsIHNhbXBsZXMgZnJvbSB0 aGUgZmlyc3Qgc291cmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1U cmFja1JlbmRlcmVyQ29jb2EuY3BwCmluZGV4IDdmYjIyYzhkNzcxYTRjZjVjMzNlNTA5ZTUzOTdl YmVlYWVlMDc3MTIuLmFlNzg5OWExMDgwZjRhOTFmMmQ1MmQ0YzMzZjE3MjlhNGRmNzRhNjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlv TWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29j b2EuY3BwCkBAIC00MiwxNSArNDIsMjAgQEAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJD b2NvYTo6QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYShJbml0JiYgaW4KIHsKIH0K IAotQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6fkF1ZGlvTWVkaWFTdHJlYW1U cmFja1JlbmRlcmVyQ29jb2EoKSA9IGRlZmF1bHQ7CitBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5k ZXJlckNvY29hOjp+QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYSgpCit7CisgICAg QVNTRVJUKCFtX3JlZ2lzdGVyZWREYXRhU291cmNlKTsKK30KIAogdm9pZCBBdWRpb01lZGlhU3Ry ZWFtVHJhY2tSZW5kZXJlckNvY29hOjpzdGFydChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYg Y2FsbGJhY2spCiB7CiAgICAgY2xlYXIoKTsKIAogICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1Jl bmRlcmVyVW5pdDo6c2luZ2xldG9uKCkucmV0cmlldmVGb3JtYXREZXNjcmlwdGlvbihbd2Vha1Ro aXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0 byogZm9ybWF0RGVzY3JpcHRpb24pIG11dGFibGUgewotICAgICAgICBpZiAod2Vha1RoaXMgJiYg Zm9ybWF0RGVzY3JpcHRpb24pCisgICAgICAgIGlmICh3ZWFrVGhpcyAmJiBmb3JtYXREZXNjcmlw dGlvbikgewogICAgICAgICAgICAgd2Vha1RoaXMtPm1fb3V0cHV0RGVzY3JpcHRpb24gPSBtYWtl VW5pcXVlPENBQXVkaW9TdHJlYW1EZXNjcmlwdGlvbj4oKmZvcm1hdERlc2NyaXB0aW9uKTsKKyAg ICAgICAgICAgIHdlYWtUaGlzLT5tX3Nob3VsZFJlY3JlYXRlRGF0YVNvdXJjZSA9IHRydWU7Cisg ICAgICAgIH0KICAgICAgICAgY2FsbGJhY2soKTsKICAgICB9KTsKIH0KQEAgLTY0LDI5ICs2OSwy OSBAQCBCYXNlQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJVbml0JiBBdWRpb01lZGlhU3Ry ZWFtVHJhY2tSZW5kZXJlckNvY29hOjpyZW5kZQogCiB2b2lkIEF1ZGlvTWVkaWFTdHJlYW1UcmFj a1JlbmRlcmVyQ29jb2E6OnN0b3AoKQogewotICAgIGlmIChtX2RhdGFTb3VyY2UpCi0gICAgICAg IHJlbmRlcmVyVW5pdCgpLnJlbW92ZVNvdXJjZSgqbV9kYXRhU291cmNlKTsKKyAgICBpZiAobV9y ZWdpc3RlcmVkRGF0YVNvdXJjZSkKKyAgICAgICAgcmVuZGVyZXJVbml0KCkucmVtb3ZlU291cmNl KCptX3JlZ2lzdGVyZWREYXRhU291cmNlKTsKIH0KIAogdm9pZCBBdWRpb01lZGlhU3RyZWFtVHJh Y2tSZW5kZXJlckNvY29hOjpjbGVhcigpCiB7CiAgICAgc3RvcCgpOwogCi0gICAgbV9kYXRhU291 cmNlID0gbnVsbHB0cjsKKyAgICBzZXRSZWdpc3RlcmVkRGF0YVNvdXJjZShudWxscHRyKTsKICAg ICBtX291dHB1dERlc2NyaXB0aW9uID0geyB9OwogfQogCiB2b2lkIEF1ZGlvTWVkaWFTdHJlYW1U cmFja1JlbmRlcmVyQ29jb2E6OnNldFZvbHVtZShmbG9hdCB2b2x1bWUpCiB7CiAgICAgQXVkaW9N ZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXI6OnNldFZvbHVtZSh2b2x1bWUpOwotICAgIGlmIChtX2Rh dGFTb3VyY2UpCi0gICAgICAgIG1fZGF0YVNvdXJjZS0+c2V0Vm9sdW1lKHZvbHVtZSk7CisgICAg aWYgKG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UpCisgICAgICAgIG1fcmVnaXN0ZXJlZERhdGFTb3Vy Y2UtPnNldFZvbHVtZSh2b2x1bWUpOwogfQogCiB2b2lkIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1Jl bmRlcmVyQ29jb2E6OnJlc2V0KCkKIHsKLSAgICBpZiAobV9kYXRhU291cmNlKQotICAgICAgICBt X2RhdGFTb3VyY2UtPnJlY29tcHV0ZVNhbXBsZU9mZnNldCgpOworICAgIGlmIChtX3JlZ2lzdGVy ZWREYXRhU291cmNlKQorICAgICAgICBtX3JlZ2lzdGVyZWREYXRhU291cmNlLT5yZWNvbXB1dGVT YW1wbGVPZmZzZXQoKTsKIH0KIAogdm9pZCBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNv Y29hOjpzZXRBdWRpb091dHB1dERldmljZShjb25zdCBTdHJpbmcmIGRldmljZUlkKQpAQCAtOTYs NiArMTAxLDI2IEBAIHZvaWQgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6c2V0 QXVkaW9PdXRwdXREZXZpY2UoY29uc3QgU3RyaW5nJiBkZXZpCiAgICAgbV9zaG91bGRSZWNyZWF0 ZURhdGFTb3VyY2UgPSB0cnVlOwogfQogCit2b2lkIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRl cmVyQ29jb2E6OnNldFJlZ2lzdGVyZWREYXRhU291cmNlKFJlZlB0cjxBdWRpb1NhbXBsZURhdGFT b3VyY2U+JiYgc291cmNlKQoreworICAgIGlmIChtX3JlZ2lzdGVyZWREYXRhU291cmNlKQorICAg ICAgICByZW5kZXJlclVuaXQoKS5yZW1vdmVTb3VyY2UoKm1fcmVnaXN0ZXJlZERhdGFTb3VyY2Up OworCisgICAgaWYgKCFtX291dHB1dERlc2NyaXB0aW9uKQorICAgICAgICByZXR1cm47CisKKyAg ICBtX3JlZ2lzdGVyZWREYXRhU291cmNlID0gV1RGTW92ZShzb3VyY2UpOworICAgIGlmICghbV9y ZWdpc3RlcmVkRGF0YVNvdXJjZSkKKyAgICAgICAgcmV0dXJuOworCisjaWYgIVJFTEVBU0VfTE9H X0RJU0FCTEVECisgICAgbV9yZWdpc3RlcmVkRGF0YVNvdXJjZS0+c2V0TG9nZ2VyKGxvZ2dlcigp LCBsb2dJZGVudGlmaWVyKCkpOworI2VuZGlmCisgICAgbV9yZWdpc3RlcmVkRGF0YVNvdXJjZS0+ c2V0Vm9sdW1lKHZvbHVtZSgpKTsKKyAgICByZW5kZXJlclVuaXQoKS5hZGRSZXNldE9ic2VydmVy KG1fcmVzZXRPYnNlcnZlcik7CisgICAgcmVuZGVyZXJVbml0KCkuYWRkU291cmNlKCptX3JlZ2lz dGVyZWREYXRhU291cmNlKTsKK30KKwogc3RhdGljIHVuc2lnbmVkIHBvbGxTYW1wbGVzQ291bnQo KQogewogI2lmIFVTRShMSUJXRUJSVEMpCkBAIC0xMjYsMTkgKzE1MSw5IEBAIHZvaWQgQXVkaW9N ZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6cHVzaFNhbXBsZXMoY29uc3QgTWVkaWFUaW1l JiBzYW1wbGVUaW1lCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBj YWxsT25NYWluVGhyZWFkKFt0aGlzLCB3ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCBvbGRT b3VyY2UgPSBtX2RhdGFTb3VyY2UsIG5ld1NvdXJjZSA9IGRhdGFTb3VyY2VdKCkgbXV0YWJsZSB7 Ci0gICAgICAgICAgICBpZiAoIXdlYWtUaGlzKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQot I2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgICAgICAgICAgbmV3U291cmNlLT5zZXRMb2dn ZXIobG9nZ2VyKCksIGxvZ0lkZW50aWZpZXIoKSk7Ci0jZW5kaWYKLSAgICAgICAgICAgIGlmIChv bGRTb3VyY2UpCi0gICAgICAgICAgICAgICAgcmVuZGVyZXJVbml0KCkucmVtb3ZlU291cmNlKCpv bGRTb3VyY2UpOwotCi0gICAgICAgICAgICBuZXdTb3VyY2UtPnNldFZvbHVtZSh2b2x1bWUoKSk7 Ci0gICAgICAgICAgICByZW5kZXJlclVuaXQoKS5hZGRSZXNldE9ic2VydmVyKG1fcmVzZXRPYnNl cnZlcik7Ci0gICAgICAgICAgICByZW5kZXJlclVuaXQoKS5hZGRTb3VyY2UoV1RGTW92ZShuZXdT b3VyY2UpKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbd2Vha1RoaXMgPSBXZWFrUHRyIHsg KnRoaXMgfSwgbmV3U291cmNlID0gZGF0YVNvdXJjZV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAg IGlmICh3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICB3ZWFrVGhpcy0+c2V0UmVnaXN0ZXJlZERh dGFTb3VyY2UoV1RGTW92ZShuZXdTb3VyY2UpKTsKICAgICAgICAgfSk7CiAgICAgICAgIG1fZGF0 YVNvdXJjZSA9IFdURk1vdmUoZGF0YVNvdXJjZSk7CiAgICAgICAgIG1fc2hvdWxkUmVjcmVhdGVE YXRhU291cmNlID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFt VHJhY2tSZW5kZXJlckNvY29hLmgKaW5kZXggNjQ2Njk4Nzc0OTViNjk5ZjdiYjZhMzU0OTBjMjQ5 MzMzMDE2OTE1ZC4uNmJmZjBiMDU3MmJmZDg4N2QwNmVlNDMzODU3ZGZmMGIxNWI5OTM4MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2EvQXVkaW9N ZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2Eu aApAQCAtNTgsMTEgKzU4LDEzIEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRBdWRpb091dHB1dERl dmljZShjb25zdCBTdHJpbmcmKSBmaW5hbDsKIAogICAgIHZvaWQgcmVzZXQoKTsKKyAgICB2b2lk IHNldFJlZ2lzdGVyZWREYXRhU291cmNlKFJlZlB0cjxBdWRpb1NhbXBsZURhdGFTb3VyY2U+JiYp OwogCiAgICAgQmFzZUF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyVW5pdCYgcmVuZGVyZXJV bml0KCk7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q0FBdWRpb1N0cmVhbURlc2NyaXB0aW9uPiBt X291dHB1dERlc2NyaXB0aW9uOwotICAgIFJlZlB0cjxBdWRpb1NhbXBsZURhdGFTb3VyY2U+IG1f ZGF0YVNvdXJjZTsKKyAgICBSZWZQdHI8QXVkaW9TYW1wbGVEYXRhU291cmNlPiBtX2RhdGFTb3Vy Y2U7IC8vIFVzZWQgaW4gYmFja2dyb3VuZCB0aHJlYWQuCisgICAgUmVmUHRyPEF1ZGlvU2FtcGxl RGF0YVNvdXJjZT4gbV9yZWdpc3RlcmVkRGF0YVNvdXJjZTsgLy8gVXNlZCBpbiBtYWluIHRocmVh ZC4KICAgICBib29sIG1fc2hvdWxkUmVjcmVhdGVEYXRhU291cmNlIHsgZmFsc2UgfTsKICAgICBX ZWJDb3JlOjpBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlclVuaXQ6OlJlc2V0T2JzZXJ2ZXIg bV9yZXNldE9ic2VydmVyOwogfTsK 442696 2021-10-28 05:38:00 -0700 2021-10-29 03:05:15 -0700 Patch bug-232430-20211028143758.patch text/plain 7340 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUyYzkwNjQyZGRlMGFl OWFkYmRhNjc5MzFlNmM4OTM4M2FjODU0YS4uNTc4MmE1OWMxMzdmN2FmY2U3M2MwYWI1ZjJjZmVk MWE4ODhiMTIxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTEwLTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggcG90ZW50aWFsIHJh Y2UgaW4gQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6cHVzaFNhbXBsZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQzMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNhc2Ugd2Ug c3RhcnQgYSBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hLCBhbmQgd2UgcXVpY2ts eSBzdG9wIGl0LCB0aGVyZSBtYXkgYmUgYSB0aW1lCisgICAgICAgIHdoZXJlIHdlIGNyZWF0ZSBh biBBdWRpb1NhbXBsZURhdGFTb3VyY2UgZnJvbSBhIGJhY2tncm91bmQgdGhyZWFkLCB0aGVuIGhv cCB0byBtYWluIHRocmVhZC4KKyAgICAgICAgV2Ugd291bGQgdGhlbiByZWdpc3RlciBpdCB0byB0 aGUgcmVuZGVyaW5nIHVuaXQgZXZlbiBpZiB0aGUgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVy ZXJDb2NvYSBpcyBjbGVhcmVkLgorICAgICAgICBUaGUgQXVkaW9TYW1wbGVEYXRhU291cmNlIHdv dWxkIHRoZW4gYmUga2VwdCByZWdpc3RlcmVkIHdpdGggbm8gZGF0YSB3aGljaCB3b3VsZCBiZSB3 YXN0ZWZ1bCBpbiB0ZXJtcyBvZiBDUFUuCisgICAgICAgIFRvIGZpeCB0aGlzLCB3ZSBrZWVwIG1f ZGF0YVNvdXJjZSBidXQgaW50cm9kdWNlIGEgbV9yZWdpc3RlcmVkRGF0YVNvdXJjZS4KKyAgICAg ICAgbV9yZWdpc3RlcmVkRGF0YVNvdXJjZSBpcyBvbmx5IG1hbmlwdWxhdGVkIGluIG1haW4gdGhy ZWFkIGFuZCBpcyB0aGUgb25lIHRoYXQgaXMgcmVnaXN0ZXJlZC91bnJlZ2lzdGVyZWQgdG8gdGhl IHJlbmRlcmluZyB1bml0LgorICAgICAgICBtX2RhdGFTb3VyY2UgaXMgb25seSBhY2Nlc3NlZCBm cm9tIGJhY2tncm91bmQgdGhyZWFkLgorCisgICAgICAgIE1hbnVhbGx5IHRlc3RlZCBhbmQgY292 ZXJlZCBieSBhZGRlZCBhc3NlcnRpb24gaW4gQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJD b2NvYSBkZXN0cnVjdG9yLgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2Ev QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjp+QXVkaW9NZWRpYVN0cmVhbVRy YWNrUmVuZGVyZXJDb2NvYSk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb01lZGlhU3RyZWFtVHJh Y2tSZW5kZXJlckNvY29hOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb01lZGlhU3Ry ZWFtVHJhY2tSZW5kZXJlckNvY29hOjpzZXRSZWdpc3RlcmVkRGF0YVNvdXJjZSk6CisgICAgICAg IChXZWJDb3JlOjpBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjpwdXNoU2FtcGxl cyk6CisgICAgICAgIChXZWJDb3JlOjpwb2xsU2FtcGxlc0NvdW50KTogRGVsZXRlZC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5k ZXJlckNvY29hLmg6CisKIDIwMjEtMTAtMjYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgogCiAgICAgICAgIE9ubHkgb25lIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBs ZXMgaXMgbmVlZGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1UcmFj a1JlbmRlcmVyQ29jb2EuY3BwCmluZGV4IGIyMDUzMzRkODM3MDlhZjlmNzY3ZWJjMDBlMmMyMTgy ZmEyY2E1ZmMuLmU5MTFmNzVhZGY3ZTE5YThkN2IxZTc3NDQzMjJlOGY1ODcxMGM5YWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVk aWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2Eu Y3BwCkBAIC00MSw0NCArNDEsNDkgQEAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2Nv YTo6QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYSgpCiB7CiB9CiAKLUF1ZGlvTWVk aWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2E6On5BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJl ckNvY29hKCkgPSBkZWZhdWx0OworQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6 fkF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2EoKQoreworICAgIEFTU0VSVCghbV9y ZWdpc3RlcmVkRGF0YVNvdXJjZSk7Cit9CiAKIHZvaWQgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVu ZGVyZXJDb2NvYTo6c3RhcnQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNhbGxiYWNrKQog ewogICAgIGNsZWFyKCk7CiAKICAgICBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlclVuaXQ6 OnNpbmdsZXRvbigpLnJldHJpZXZlRm9ybWF0RGVzY3JpcHRpb24oW3dlYWtUaGlzID0gV2Vha1B0 ciB7ICp0aGlzIH0sIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8qIGZvcm1hdERl c2NyaXB0aW9uKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKHdlYWtUaGlzICYmIGZvcm1hdERlc2Ny aXB0aW9uKQorICAgICAgICBpZiAod2Vha1RoaXMgJiYgZm9ybWF0RGVzY3JpcHRpb24pIHsKICAg ICAgICAgICAgIHdlYWtUaGlzLT5tX291dHB1dERlc2NyaXB0aW9uID0gbWFrZVVuaXF1ZTxDQUF1 ZGlvU3RyZWFtRGVzY3JpcHRpb24+KCpmb3JtYXREZXNjcmlwdGlvbik7CisgICAgICAgICAgICB3 ZWFrVGhpcy0+bV9zaG91bGRSZWNyZWF0ZURhdGFTb3VyY2UgPSB0cnVlOworICAgICAgICB9CiAg ICAgICAgIGNhbGxiYWNrKCk7CiAgICAgfSk7CiB9CiAKIHZvaWQgQXVkaW9NZWRpYVN0cmVhbVRy YWNrUmVuZGVyZXJDb2NvYTo6c3RvcCgpCiB7Ci0gICAgaWYgKG1fZGF0YVNvdXJjZSkKLSAgICAg ICAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJVbml0OjpzaW5nbGV0b24oKS5yZW1vdmVT b3VyY2UoKm1fZGF0YVNvdXJjZSk7CisgICAgaWYgKG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UpCisg ICAgICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyVW5pdDo6c2luZ2xldG9uKCkucmVt b3ZlU291cmNlKCptX3JlZ2lzdGVyZWREYXRhU291cmNlKTsKIH0KIAogdm9pZCBBdWRpb01lZGlh U3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjpjbGVhcigpCiB7CiAgICAgc3RvcCgpOwogCi0gICAg bV9kYXRhU291cmNlID0gbnVsbHB0cjsKKyAgICBzZXRSZWdpc3RlcmVkRGF0YVNvdXJjZShudWxs cHRyKTsKICAgICBtX291dHB1dERlc2NyaXB0aW9uID0geyB9OwogfQogCiB2b2lkIEF1ZGlvTWVk aWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2E6OnNldFZvbHVtZShmbG9hdCB2b2x1bWUpCiB7CiAg ICAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXI6OnNldFZvbHVtZSh2b2x1bWUpOwotICAg IGlmIChtX2RhdGFTb3VyY2UpCi0gICAgICAgIG1fZGF0YVNvdXJjZS0+c2V0Vm9sdW1lKHZvbHVt ZSk7CisgICAgaWYgKG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UpCisgICAgICAgIG1fcmVnaXN0ZXJl ZERhdGFTb3VyY2UtPnNldFZvbHVtZSh2b2x1bWUpOwogfQogCiB2b2lkIEF1ZGlvTWVkaWFTdHJl YW1UcmFja1JlbmRlcmVyQ29jb2E6OnJlc2V0KCkKIHsKLSAgICBpZiAobV9kYXRhU291cmNlKQot ICAgICAgICBtX2RhdGFTb3VyY2UtPnJlY29tcHV0ZVNhbXBsZU9mZnNldCgpOworICAgIGlmICht X3JlZ2lzdGVyZWREYXRhU291cmNlKQorICAgICAgICBtX3JlZ2lzdGVyZWREYXRhU291cmNlLT5y ZWNvbXB1dGVTYW1wbGVPZmZzZXQoKTsKIH0KIAogdm9pZCBBdWRpb01lZGlhU3RyZWFtVHJhY2tS ZW5kZXJlckNvY29hOjpzZXRBdWRpb091dHB1dERldmljZShjb25zdCBTdHJpbmcmIGRldmljZUlk KQpAQCAtODgsNiArOTMsMjYgQEAgdm9pZCBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNv Y29hOjpzZXRBdWRpb091dHB1dERldmljZShjb25zdCBTdHJpbmcmIGRldmkKICAgICBtX3Nob3Vs ZFJlY3JlYXRlRGF0YVNvdXJjZSA9IHRydWU7CiB9CiAKK3ZvaWQgQXVkaW9NZWRpYVN0cmVhbVRy YWNrUmVuZGVyZXJDb2NvYTo6c2V0UmVnaXN0ZXJlZERhdGFTb3VyY2UoUmVmUHRyPEF1ZGlvU2Ft cGxlRGF0YVNvdXJjZT4mJiBzb3VyY2UpCit7CisgICAgaWYgKG1fcmVnaXN0ZXJlZERhdGFTb3Vy Y2UpCisgICAgICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyVW5pdDo6c2luZ2xldG9u KCkucmVtb3ZlU291cmNlKCptX3JlZ2lzdGVyZWREYXRhU291cmNlKTsKKworICAgIGlmICghbV9v dXRwdXREZXNjcmlwdGlvbikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9yZWdpc3RlcmVkRGF0 YVNvdXJjZSA9IFdURk1vdmUoc291cmNlKTsKKyAgICBpZiAoIW1fcmVnaXN0ZXJlZERhdGFTb3Vy Y2UpCisgICAgICAgIHJldHVybjsKKworI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAorICAgIG1f cmVnaXN0ZXJlZERhdGFTb3VyY2UtPnNldExvZ2dlcihsb2dnZXIoKSwgbG9nSWRlbnRpZmllcigp KTsKKyNlbmRpZgorICAgIG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UtPnNldFZvbHVtZSh2b2x1bWUo KSk7CisgICAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJVbml0OjpzaW5nbGV0b24oKS5h ZGRSZXNldE9ic2VydmVyKG1fcmVzZXRPYnNlcnZlcik7CisgICAgQXVkaW9NZWRpYVN0cmVhbVRy YWNrUmVuZGVyZXJVbml0OjpzaW5nbGV0b24oKS5hZGRTb3VyY2UoKm1fcmVnaXN0ZXJlZERhdGFT b3VyY2UpOworfQorCiBzdGF0aWMgdW5zaWduZWQgcG9sbFNhbXBsZXNDb3VudCgpCiB7CiAjaWYg VVNFKExJQldFQlJUQykKQEAgLTExOCwxOSArMTQzLDkgQEAgdm9pZCBBdWRpb01lZGlhU3RyZWFt VHJhY2tSZW5kZXJlckNvY29hOjpwdXNoU2FtcGxlcyhjb25zdCBNZWRpYVRpbWUmIHNhbXBsZVRp bWUKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGNhbGxPbk1haW5U aHJlYWQoW3RoaXMsIHdlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIG9sZFNvdXJjZSA9IG1f ZGF0YVNvdXJjZSwgbmV3U291cmNlID0gZGF0YVNvdXJjZV0oKSBtdXRhYmxlIHsKLSAgICAgICAg ICAgIGlmICghd2Vha1RoaXMpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotCi0jaWYgIVJFTEVB U0VfTE9HX0RJU0FCTEVECi0gICAgICAgICAgICBuZXdTb3VyY2UtPnNldExvZ2dlcihsb2dnZXIo KSwgbG9nSWRlbnRpZmllcigpKTsKLSNlbmRpZgotICAgICAgICAgICAgaWYgKG9sZFNvdXJjZSkK LSAgICAgICAgICAgICAgICBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlclVuaXQ6OnNpbmds ZXRvbigpLnJlbW92ZVNvdXJjZSgqb2xkU291cmNlKTsKLQotICAgICAgICAgICAgbmV3U291cmNl LT5zZXRWb2x1bWUodm9sdW1lKCkpOwotICAgICAgICAgICAgQXVkaW9NZWRpYVN0cmVhbVRyYWNr UmVuZGVyZXJVbml0OjpzaW5nbGV0b24oKS5hZGRSZXNldE9ic2VydmVyKG1fcmVzZXRPYnNlcnZl cik7Ci0gICAgICAgICAgICBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlclVuaXQ6OnNpbmds ZXRvbigpLmFkZFNvdXJjZShXVEZNb3ZlKG5ld1NvdXJjZSkpOworICAgICAgICBjYWxsT25NYWlu VGhyZWFkKFt3ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCBuZXdTb3VyY2UgPSBkYXRhU291 cmNlXSgpIG11dGFibGUgeworICAgICAgICAgICAgaWYgKHdlYWtUaGlzKQorICAgICAgICAgICAg ICAgIHdlYWtUaGlzLT5zZXRSZWdpc3RlcmVkRGF0YVNvdXJjZShXVEZNb3ZlKG5ld1NvdXJjZSkp OwogICAgICAgICB9KTsKICAgICAgICAgbV9kYXRhU291cmNlID0gV1RGTW92ZShkYXRhU291cmNl KTsKICAgICAgICAgbV9zaG91bGRSZWNyZWF0ZURhdGFTb3VyY2UgPSBmYWxzZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFT dHJlYW1UcmFja1JlbmRlcmVyQ29jb2EuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2EuaAppbmRleCAz YTdiM2RjOTEzMmU2ZjQxMjE0ZWE4NDc1YWNlZTNjMDExZTJjZTNkLi5mZGEwZmZlYTY0ODAxMjE4 NDZhMjI4MDE1ZTBmZjRmZGU4NjYzNTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29h LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2EvQXVkaW9N ZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYS5oCkBAIC01Nyw5ICs1NywxMSBAQCBwcml2YXRl OgogICAgIHZvaWQgc2V0QXVkaW9PdXRwdXREZXZpY2UoY29uc3QgU3RyaW5nJikgZmluYWw7CiAK ICAgICB2b2lkIHJlc2V0KCk7CisgICAgdm9pZCBzZXRSZWdpc3RlcmVkRGF0YVNvdXJjZShSZWZQ dHI8QXVkaW9TYW1wbGVEYXRhU291cmNlPiYmKTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxDQUF1 ZGlvU3RyZWFtRGVzY3JpcHRpb24+IG1fb3V0cHV0RGVzY3JpcHRpb247Ci0gICAgUmVmUHRyPEF1 ZGlvU2FtcGxlRGF0YVNvdXJjZT4gbV9kYXRhU291cmNlOworICAgIFJlZlB0cjxBdWRpb1NhbXBs ZURhdGFTb3VyY2U+IG1fZGF0YVNvdXJjZTsgLy8gVXNlZCBpbiBiYWNrZ3JvdW5kIHRocmVhZC4K KyAgICBSZWZQdHI8QXVkaW9TYW1wbGVEYXRhU291cmNlPiBtX3JlZ2lzdGVyZWREYXRhU291cmNl OyAvLyBVc2VkIGluIG1haW4gdGhyZWFkLgogICAgIGJvb2wgbV9zaG91bGRSZWNyZWF0ZURhdGFT b3VyY2UgeyBmYWxzZSB9OwogICAgIFdlYkNvcmU6OkF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRl cmVyVW5pdDo6UmVzZXRPYnNlcnZlciBtX3Jlc2V0T2JzZXJ2ZXI7CiB9Owo= 442801 2021-10-29 03:05:20 -0700 2021-10-29 03:59:43 -0700 Patch for landing bug-232430-20211029120518.patch text/plain 7443 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZiNTUyN2E5MzU5OWVh YzlkNmJjMzc3OWQ5YzBkZWQyYjBkN2FhYS4uNDY4NTQ2MjY3ZTdhZTEzOTY5NjQ1YWIzNGNjNGYy MzNjMWJjM2QzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTEwLTI5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggcG90ZW50aWFsIHJh Y2UgaW4gQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6cHVzaFNhbXBsZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQzMAorCisg ICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBJbiBjYXNlIHdlIHN0 YXJ0IGEgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYSwgYW5kIHdlIHF1aWNrbHkg c3RvcCBpdCwgdGhlcmUgbWF5IGJlIGEgdGltZQorICAgICAgICB3aGVyZSB3ZSBjcmVhdGUgYW4g QXVkaW9TYW1wbGVEYXRhU291cmNlIGZyb20gYSBiYWNrZ3JvdW5kIHRocmVhZCwgdGhlbiBob3Ag dG8gbWFpbiB0aHJlYWQuCisgICAgICAgIFdlIHdvdWxkIHRoZW4gcmVnaXN0ZXIgaXQgdG8gdGhl IHJlbmRlcmluZyB1bml0IGV2ZW4gaWYgdGhlIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVy Q29jb2EgaXMgY2xlYXJlZC4KKyAgICAgICAgVGhlIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZSB3b3Vs ZCB0aGVuIGJlIGtlcHQgcmVnaXN0ZXJlZCB3aXRoIG5vIGRhdGEgd2hpY2ggd291bGQgYmUgd2Fz dGVmdWwgaW4gdGVybXMgb2YgQ1BVLgorICAgICAgICBUbyBmaXggdGhpcywgd2Uga2VlcCBtX2Rh dGFTb3VyY2UgYnV0IGludHJvZHVjZSBhIG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UuCisgICAgICAg IG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UgaXMgb25seSBtYW5pcHVsYXRlZCBpbiBtYWluIHRocmVh ZCBhbmQgaXMgdGhlIG9uZSB0aGF0IGlzIHJlZ2lzdGVyZWQvdW5yZWdpc3RlcmVkIHRvIHRoZSBy ZW5kZXJpbmcgdW5pdC4KKyAgICAgICAgbV9kYXRhU291cmNlIGlzIG9ubHkgYWNjZXNzZWQgZnJv bSBiYWNrZ3JvdW5kIHRocmVhZC4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQgYW5kIGNvdmVy ZWQgYnkgYWRkZWQgYXNzZXJ0aW9uIGluIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29j b2EgZGVzdHJ1Y3Rvci4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1 ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6fkF1ZGlvTWVkaWFTdHJlYW1UcmFj a1JlbmRlcmVyQ29jb2EpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9NZWRpYVN0cmVhbVRyYWNr UmVuZGVyZXJDb2NvYTo6Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9NZWRpYVN0cmVh bVRyYWNrUmVuZGVyZXJDb2NvYTo6c2V0UmVnaXN0ZXJlZERhdGFTb3VyY2UpOgorICAgICAgICAo V2ViQ29yZTo6QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6cHVzaFNhbXBsZXMp OgorICAgICAgICAoV2ViQ29yZTo6cG9sbFNhbXBsZXNDb3VudCk6IERlbGV0ZWQuCisgICAgICAg ICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2EvQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVy ZXJDb2NvYS5oOgorCiAyMDIxLTEwLTI5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBMb2NhbEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVySW50ZXJuYWxV bml0IHNob3VsZCBjbGlwIGF1ZGlvIGRhdGEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29j b2EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2EvQXVkaW9N ZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYS5jcHAKaW5kZXggYjIwNTMzNGQ4MzcwOWFmOWY3 NjdlYmMwMGUyYzIxODJmYTJjYTVmYy4uOTY4M2Y2YzIyNThkM2ExZjYyMWUzMTk3NTBkZmZjNTNh OWMzMDk1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v Y29jb2EvQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2EvQXVkaW9NZWRpYVN0cmVhbVRyYWNr UmVuZGVyZXJDb2NvYS5jcHAKQEAgLTQxLDQ0ICs0MSw1NSBAQCBBdWRpb01lZGlhU3RyZWFtVHJh Y2tSZW5kZXJlckNvY29hOjpBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hKCkKIHsK IH0KIAotQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYTo6fkF1ZGlvTWVkaWFTdHJl YW1UcmFja1JlbmRlcmVyQ29jb2EoKSA9IGRlZmF1bHQ7CitBdWRpb01lZGlhU3RyZWFtVHJhY2tS ZW5kZXJlckNvY29hOjp+QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYSgpCit7Cisg ICAgQVNTRVJUKCFtX3JlZ2lzdGVyZWREYXRhU291cmNlKTsKK30KIAogdm9pZCBBdWRpb01lZGlh U3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjpzdGFydChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYgY2FsbGJhY2spCiB7CiAgICAgY2xlYXIoKTsKIAogICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFj a1JlbmRlcmVyVW5pdDo6c2luZ2xldG9uKCkucmV0cmlldmVGb3JtYXREZXNjcmlwdGlvbihbd2Vh a1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0o YXV0byogZm9ybWF0RGVzY3JpcHRpb24pIG11dGFibGUgewotICAgICAgICBpZiAod2Vha1RoaXMg JiYgZm9ybWF0RGVzY3JpcHRpb24pCisgICAgICAgIGlmICh3ZWFrVGhpcyAmJiBmb3JtYXREZXNj cmlwdGlvbikgewogICAgICAgICAgICAgd2Vha1RoaXMtPm1fb3V0cHV0RGVzY3JpcHRpb24gPSBt YWtlVW5pcXVlPENBQXVkaW9TdHJlYW1EZXNjcmlwdGlvbj4oKmZvcm1hdERlc2NyaXB0aW9uKTsK KyAgICAgICAgICAgIHdlYWtUaGlzLT5tX3Nob3VsZFJlY3JlYXRlRGF0YVNvdXJjZSA9IHRydWU7 CisgICAgICAgIH0KICAgICAgICAgY2FsbGJhY2soKTsKICAgICB9KTsKIH0KIAogdm9pZCBBdWRp b01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjpzdG9wKCkKIHsKLSAgICBpZiAobV9kYXRh U291cmNlKQotICAgICAgICBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlclVuaXQ6OnNpbmds ZXRvbigpLnJlbW92ZVNvdXJjZSgqbV9kYXRhU291cmNlKTsKKyAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOworCisgICAgaWYgKG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UpCisgICAgICAgIEF1ZGlv TWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyVW5pdDo6c2luZ2xldG9uKCkucmVtb3ZlU291cmNlKCpt X3JlZ2lzdGVyZWREYXRhU291cmNlKTsKIH0KIAogdm9pZCBBdWRpb01lZGlhU3RyZWFtVHJhY2tS ZW5kZXJlckNvY29hOjpjbGVhcigpCiB7CiAgICAgc3RvcCgpOwogCi0gICAgbV9kYXRhU291cmNl ID0gbnVsbHB0cjsKKyAgICBzZXRSZWdpc3RlcmVkRGF0YVNvdXJjZShudWxscHRyKTsKICAgICBt X291dHB1dERlc2NyaXB0aW9uID0geyB9OwogfQogCiB2b2lkIEF1ZGlvTWVkaWFTdHJlYW1UcmFj a1JlbmRlcmVyQ29jb2E6OnNldFZvbHVtZShmbG9hdCB2b2x1bWUpCiB7CisgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKKwogICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyOjpzZXRW b2x1bWUodm9sdW1lKTsKLSAgICBpZiAobV9kYXRhU291cmNlKQotICAgICAgICBtX2RhdGFTb3Vy Y2UtPnNldFZvbHVtZSh2b2x1bWUpOworICAgIGlmIChtX3JlZ2lzdGVyZWREYXRhU291cmNlKQor ICAgICAgICBtX3JlZ2lzdGVyZWREYXRhU291cmNlLT5zZXRWb2x1bWUodm9sdW1lKTsKIH0KIAog dm9pZCBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hOjpyZXNldCgpCiB7Ci0gICAg aWYgKG1fZGF0YVNvdXJjZSkKLSAgICAgICAgbV9kYXRhU291cmNlLT5yZWNvbXB1dGVTYW1wbGVP ZmZzZXQoKTsKKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOworCisgICAgaWYgKG1fcmVnaXN0 ZXJlZERhdGFTb3VyY2UpCisgICAgICAgIG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UtPnJlY29tcHV0 ZVNhbXBsZU9mZnNldCgpOwogfQogCiB2b2lkIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVy Q29jb2E6OnNldEF1ZGlvT3V0cHV0RGV2aWNlKGNvbnN0IFN0cmluZyYgZGV2aWNlSWQpCkBAIC04 OCw2ICs5OSwyNiBAQCB2b2lkIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyQ29jb2E6OnNl dEF1ZGlvT3V0cHV0RGV2aWNlKGNvbnN0IFN0cmluZyYgZGV2aQogICAgIG1fc2hvdWxkUmVjcmVh dGVEYXRhU291cmNlID0gdHJ1ZTsKIH0KIAordm9pZCBBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5k ZXJlckNvY29hOjpzZXRSZWdpc3RlcmVkRGF0YVNvdXJjZShSZWZQdHI8QXVkaW9TYW1wbGVEYXRh U291cmNlPiYmIHNvdXJjZSkKK3sKKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOworCisgICAg aWYgKG1fcmVnaXN0ZXJlZERhdGFTb3VyY2UpCisgICAgICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFj a1JlbmRlcmVyVW5pdDo6c2luZ2xldG9uKCkucmVtb3ZlU291cmNlKCptX3JlZ2lzdGVyZWREYXRh U291cmNlKTsKKworICAgIGlmICghbV9vdXRwdXREZXNjcmlwdGlvbikKKyAgICAgICAgcmV0dXJu OworCisgICAgbV9yZWdpc3RlcmVkRGF0YVNvdXJjZSA9IFdURk1vdmUoc291cmNlKTsKKyAgICBp ZiAoIW1fcmVnaXN0ZXJlZERhdGFTb3VyY2UpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcmVn aXN0ZXJlZERhdGFTb3VyY2UtPnNldExvZ2dlcihsb2dnZXIoKSwgbG9nSWRlbnRpZmllcigpKTsK KyAgICBtX3JlZ2lzdGVyZWREYXRhU291cmNlLT5zZXRWb2x1bWUodm9sdW1lKCkpOworICAgIEF1 ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyVW5pdDo6c2luZ2xldG9uKCkuYWRkUmVzZXRPYnNl cnZlcihtX3Jlc2V0T2JzZXJ2ZXIpOworICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVy VW5pdDo6c2luZ2xldG9uKCkuYWRkU291cmNlKCptX3JlZ2lzdGVyZWREYXRhU291cmNlKTsKK30K Kwogc3RhdGljIHVuc2lnbmVkIHBvbGxTYW1wbGVzQ291bnQoKQogewogI2lmIFVTRShMSUJXRUJS VEMpCkBAIC0xMTgsMTkgKzE0OSw5IEBAIHZvaWQgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVy ZXJDb2NvYTo6cHVzaFNhbXBsZXMoY29uc3QgTWVkaWFUaW1lJiBzYW1wbGVUaW1lCiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlz LCB3ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCBvbGRTb3VyY2UgPSBtX2RhdGFTb3VyY2Us IG5ld1NvdXJjZSA9IGRhdGFTb3VyY2VdKCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICBpZiAoIXdl YWtUaGlzKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQotI2lmICFSRUxFQVNFX0xPR19ESVNB QkxFRAotICAgICAgICAgICAgbmV3U291cmNlLT5zZXRMb2dnZXIobG9nZ2VyKCksIGxvZ0lkZW50 aWZpZXIoKSk7Ci0jZW5kaWYKLSAgICAgICAgICAgIGlmIChvbGRTb3VyY2UpCi0gICAgICAgICAg ICAgICAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJVbml0OjpzaW5nbGV0b24oKS5yZW1v dmVTb3VyY2UoKm9sZFNvdXJjZSk7Ci0KLSAgICAgICAgICAgIG5ld1NvdXJjZS0+c2V0Vm9sdW1l KHZvbHVtZSgpKTsKLSAgICAgICAgICAgIEF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyVW5p dDo6c2luZ2xldG9uKCkuYWRkUmVzZXRPYnNlcnZlcihtX3Jlc2V0T2JzZXJ2ZXIpOwotICAgICAg ICAgICAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJVbml0OjpzaW5nbGV0b24oKS5hZGRT b3VyY2UoV1RGTW92ZShuZXdTb3VyY2UpKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbd2Vh a1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgbmV3U291cmNlID0gZGF0YVNvdXJjZV0oKSBtdXRh YmxlIHsKKyAgICAgICAgICAgIGlmICh3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICB3ZWFrVGhp cy0+c2V0UmVnaXN0ZXJlZERhdGFTb3VyY2UoV1RGTW92ZShuZXdTb3VyY2UpKTsKICAgICAgICAg fSk7CiAgICAgICAgIG1fZGF0YVNvdXJjZSA9IFdURk1vdmUoZGF0YVNvdXJjZSk7CiAgICAgICAg IG1fc2hvdWxkUmVjcmVhdGVEYXRhU291cmNlID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9BdWRpb01lZGlhU3RyZWFtVHJhY2tS ZW5kZXJlckNvY29hLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2Nv YS9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckNvY29hLmgKaW5kZXggM2E3YjNkYzkxMzJl NmY0MTIxNGVhODQ3NWFjZWUzYzAxMWUyY2UzZC4uZmRhMGZmZWE2NDgwMTIxODQ2YTIyODAxNWUw ZmY0ZmRlODY2MzU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vY29jb2EvQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJDb2NvYS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0F1ZGlvTWVkaWFTdHJlYW1U cmFja1JlbmRlcmVyQ29jb2EuaApAQCAtNTcsOSArNTcsMTEgQEAgcHJpdmF0ZToKICAgICB2b2lk IHNldEF1ZGlvT3V0cHV0RGV2aWNlKGNvbnN0IFN0cmluZyYpIGZpbmFsOwogCiAgICAgdm9pZCBy ZXNldCgpOworICAgIHZvaWQgc2V0UmVnaXN0ZXJlZERhdGFTb3VyY2UoUmVmUHRyPEF1ZGlvU2Ft cGxlRGF0YVNvdXJjZT4mJik7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q0FBdWRpb1N0cmVhbURl c2NyaXB0aW9uPiBtX291dHB1dERlc2NyaXB0aW9uOwotICAgIFJlZlB0cjxBdWRpb1NhbXBsZURh dGFTb3VyY2U+IG1fZGF0YVNvdXJjZTsKKyAgICBSZWZQdHI8QXVkaW9TYW1wbGVEYXRhU291cmNl PiBtX2RhdGFTb3VyY2U7IC8vIFVzZWQgaW4gYmFja2dyb3VuZCB0aHJlYWQuCisgICAgUmVmUHRy PEF1ZGlvU2FtcGxlRGF0YVNvdXJjZT4gbV9yZWdpc3RlcmVkRGF0YVNvdXJjZTsgLy8gVXNlZCBp biBtYWluIHRocmVhZC4KICAgICBib29sIG1fc2hvdWxkUmVjcmVhdGVEYXRhU291cmNlIHsgZmFs c2UgfTsKICAgICBXZWJDb3JlOjpBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlclVuaXQ6OlJl c2V0T2JzZXJ2ZXIgbV9yZXNldE9ic2VydmVyOwogfTsK