237321 2022-03-01 06:31:17 -0800 Annotate LibWebRTC with thread safety macros 2022-03-02 05:51:23 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf darin eric.carlson webkit-bug-importer youennf oldest_to_newest 1847006 0 youennf 2022-03-01 06:31:17 -0800 Annotate LibWebRTC with thread safety macros 1847012 1 453496 youennf 2022-03-01 06:46:05 -0800 Created attachment 453496 Patch 1847072 2 ews-feeder 2022-03-01 09:58:05 -0800 Committed r290653 (247926@main): <https://commits.webkit.org/247926@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453496. 1847073 3 453496 darin 2022-03-01 09:58:06 -0800 Comment on attachment 453496 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453496&action=review > Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.h:148 > + void setEncoderConnection(Encoder&, RefPtr<IPC::Connection>&&) WTF_REQUIRES_LOCK(m_encodersConnectionLock); Stray space crept in here. 1847074 4 webkit-bug-importer 2022-03-01 09:59:18 -0800 <rdar://problem/89625577> 1847309 5 youennf 2022-03-01 23:22:20 -0800 Reopening to attach new patch. 1847310 6 453574 youennf 2022-03-01 23:22:27 -0800 Created attachment 453574 Patch 1847350 7 ews-feeder 2022-03-02 05:51:20 -0800 Committed r290725 (247972@main): <https://commits.webkit.org/247972@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453574. 453496 2022-03-01 06:46:05 -0800 2022-03-01 23:22:12 -0800 Patch bug-237321-20220301154603.patch text/plain 20793 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY1YTU5YjAzZjUzMjgwMTk0 MWNlZGE3Y2ExNGM0ODg1NGRmYmU2YTEuLjU1NmYzNTRiNGRjNzRiMWE1MjY1ZmQ2NTFhNmNmZTJl ZDMzYTgxOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEgQEAKKzIwMjItMDMtMDEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFubm90YXRlIExpYldlYlJUQyB3 aXRoIHRocmVhZCBzYWZldHkgbWFjcm9zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzczMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMaWJXZWJSVENDb2RlY3Mgd29ya3Mgd2l0aCAzIHRocmVhZHMgYW5k IHdlIGFkZCBtYWNyb3MgdG8gbWFrZSBpdCBjbGVhciB3aGVyZSBlYWNoIHRocmVhZCBpcyB1c2Vk OgorICAgICAgICAtIHRoZSBtYWluIHRocmVhZCB0byBnZXQgaXRzIEdQVSBwcm9jZXNzIGNvbm5l Y3Rpb24gKGlzTWFpblJ1bkxvb3AoKSkuCisgICAgICAgIC0gdGhlIGxpYndlYnJ0YyB0aHJlYWQg d2hlcmUgaXQgZ2V0cyBvcmRlcnMgdG8gZGVjb2RlL2VuY29kZSBmcmFtZXMgKCFpc01haW5SdW5M b29wKCkpCisgICAgICAgIC0gdGhlIHdvcmsgcXVldWUgdGhyZWFkIHdoZXJlIGl0IGlzIHJlY2Vp dmluZyBlbmNvZGUvZGVjb2RlIHJlc3VsdHMgKGFzc2VydElzQ3VycmVudCh3b3JrUXVldWUoKSkp LgorCisgICAgICAgIFJlbmFtZSBtX2VuY29kZXJzTG9jayB0byBtX2VuY29kZXJzQ29ubmVjdGlv bkxvY2sgdG8gbWFrZSBpdCBjbGVhciB0aGlzIGlzIGFib3V0IGxvY2tpbmcgdGhlIGVuY29kZXIg Y29ubmVjdGlvbiBhbmQgbm90IHRoZSBlbmNvZGVyIG1hcC4KKyAgICAgICAgQm90aCBkZWNvZGVy IGFuZCBlbmNvZGVyIG1hcHMgc2hvdWxkIG9ubHkgYmUgdG91Y2hlZCBvbiB0aGUgd29ya1F1ZXVl IHRocmVhZC4KKworICAgICAgICBJbnRyb2R1Y2UgZW5jb2RlckNvbm5lY3Rpb24vc2V0RW5jb2Rl ckNvbm5lY3Rpb24gYW5kIGRlY29kZXJDb25uZWN0aW9uL3NldERlY29kZXJDb25uZWN0aW9uIHJv dXRpbmVzLgorICAgICAgICBUaGVzZSBtZXRob2RzIGFyZSBndWFyZGVkIGJ5IGNvcnJlc3BvbmRp bmcgbG9ja3MuCisgICAgICAgIFRoaXMgcmVxdWlyZXMgYWRkaW5nIHNvbWUgYWRkaXRpb25hbCBs b2NrcyB3aGVuIGFjY2Vzc2luZyBjb25uZWN0aW9ucyBpbiB3b3JrUXVldWUgdGhyZWFkLgorICAg ICAgICBGaXggYSBwb3RlbnRpYWwgaXNzdWUgd2hlbiBjcmVhdGluZyB0aGUgZW5jb2Rlcjogd2Ug bG9jayB0aGUgZW5jb2RlckNvbm5lY3Rpb24gbG9jayBlYXJsaWVyIHdoZW4gc2V0dGluZyB0aGUg Y29ubmVjdGlvbi4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5jcHA6CisgICAgICAg IChXZWJLaXQ6OkxpYldlYlJUQ0NvZGVjczo6Z3B1UHJvY2Vzc0Nvbm5lY3Rpb25NYXlOb0xvbmdl ckJlTmVlZGVkKToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzOjpjcmVhdGVEZWNv ZGVyKToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzOjpyZWxlYXNlRGVjb2Rlcik6 CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ0NvZGVjczo6ZGVjb2RlRnJhbWUpOgorICAgICAg ICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3M6OnJlZ2lzdGVyRGVjb2RlRnJhbWVDYWxsYmFjayk6 CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ0NvZGVjczo6ZmFpbGVkRGVjb2RpbmcpOgorICAg ICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3M6OmNvbXBsZXRlZERlY29kaW5nKToKKyAgICAg ICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzOjpjb21wbGV0ZWREZWNvZGluZ0NWKToKKyAgICAg ICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzOjpjcmVhdGVFbmNvZGVyKToKKyAgICAgICAgKFdl YktpdDo6TGliV2ViUlRDQ29kZWNzOjpyZWxlYXNlRW5jb2Rlcik6CisgICAgICAgIChXZWJLaXQ6 OkxpYldlYlJUQ0NvZGVjczo6aW5pdGlhbGl6ZUVuY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpM aWJXZWJSVENDb2RlY3M6OmNvcHlTaGFyZWRWaWRlb0ZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6 TGliV2ViUlRDQ29kZWNzOjplbmNvZGVGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJU Q0NvZGVjczo6cmVnaXN0ZXJFbmNvZGVGcmFtZUNhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6 TGliV2ViUlRDQ29kZWNzOjpzZXRFbmNvZGVSYXRlcyk6CisgICAgICAgIChXZWJLaXQ6OkxpYldl YlJUQ0NvZGVjczo6Y29tcGxldGVkRW5jb2RpbmcpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJS VENDb2RlY3M6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UpOgorICAgICAgICAoV2ViS2l0 OjpMaWJXZWJSVENDb2RlY3M6OmVuY29kZXJDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6 TGliV2ViUlRDQ29kZWNzOjpzZXRFbmNvZGVyQ29ubmVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OkxpYldlYlJUQ0NvZGVjczo6ZGVjb2RlckNvbm5lY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpM aWJXZWJSVENDb2RlY3M6OnNldERlY29kZXJDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6 Y29weVNoYXJlZFZpZGVvRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BV L3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuaDoKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29k ZWNzOjp3b3JrUXVldWUgY29uc3QpOgorCiAyMDIyLTAzLTAxICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgUmVtb3RlVmlkZW9TYW1wbGUgc3VwcG9y dCBmcm9tIEltYWdlVHJhbnNmZXJTZXNzaW9uVlQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuY3BwCmluZGV4IDU4ZWNjMTgy ZWE0OWNjNTJlYTUyZjM1ZGIxN2U5ODFjODk4OWFjYjMuLmQ3NWI5ZmY3ZTAyMDNlMWFjMzE0Mzg1 Nzc5ZDI3ZmM3NzJkYTY3NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmNwcApAQCAtMjIxLDcgKzIyMSw4IEBAIHZv aWQgTGliV2ViUlRDQ29kZWNzOjplbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbkFuZERpc3BhdGNo VG9UaHJlYWQoRnVuY3Rpb248dm9pCiAKIHZvaWQgTGliV2ViUlRDQ29kZWNzOjpncHVQcm9jZXNz Q29ubmVjdGlvbk1heU5vTG9uZ2VyQmVOZWVkZWQoKQogewotICAgIEFTU0VSVCghaXNNYWluUnVu TG9vcCgpKTsKKyAgICBhc3NlcnRJc0N1cnJlbnQod29ya1F1ZXVlKCkpOworCiAgICAgaWYgKG1f ZW5jb2RlcnMuaXNFbXB0eSgpICYmIG1fZGVjb2RlcnMuaXNFbXB0eSgpKQogICAgICAgICBtX25l ZWRzR1BVUHJvY2Vzc0Nvbm5lY3Rpb24gPSBmYWxzZTsKIH0KQEAgLTI1NCwxNSArMjU1LDE5IEBA IHZvaWQgTGliV2ViUlRDQ29kZWNzOjpzZXRDYWxsYmFja3MoYm9vbCB1c2VHUFVQcm9jZXNzLCBi b29sIHVzZVJlbW90ZUZyYW1lcykKIAogTGliV2ViUlRDQ29kZWNzOjpEZWNvZGVyKiBMaWJXZWJS VENDb2RlY3M6OmNyZWF0ZURlY29kZXIoVHlwZSB0eXBlKQogeworICAgIEFTU0VSVCghaXNNYWlu UnVuTG9vcCgpKTsKKwogICAgIGF1dG8gZGVjb2RlciA9IG1ha2VVbmlxdWU8RGVjb2Rlcj4oKTsK ICAgICBhdXRvKiByZXN1bHQgPSBkZWNvZGVyLmdldCgpOwogICAgIGRlY29kZXItPmlkZW50aWZp ZXIgPSBSVENEZWNvZGVySWRlbnRpZmllcjo6Z2VuZXJhdGVUaHJlYWRTYWZlKCk7CiAgICAgZGVj b2Rlci0+dHlwZSA9IHR5cGU7CiAKICAgICBlbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbkFuZERp c3BhdGNoVG9UaHJlYWQoW3RoaXMsIGRlY29kZXIgPSBXVEZNb3ZlKGRlY29kZXIpXSgpIG11dGFi bGUgeworICAgICAgICBhc3NlcnRJc0N1cnJlbnQod29ya1F1ZXVlKCkpOworCiAgICAgICAgIExv Y2tlciBsb2NrZXIgeyBtX2Nvbm5lY3Rpb25Mb2NrIH07Ci0gICAgICAgIGRlY29kZXItPmNvbm5l Y3Rpb24gPSBtX2Nvbm5lY3Rpb247CiAgICAgICAgIGNyZWF0ZVJlbW90ZURlY29kZXIoKmRlY29k ZXIsICptX2Nvbm5lY3Rpb24sIG1fdXNlUmVtb3RlRnJhbWVzKTsKKyAgICAgICAgc2V0RGVjb2Rl ckNvbm5lY3Rpb24oKmRlY29kZXIsIG1fY29ubmVjdGlvbi5nZXQoKSk7CiAKICAgICAgICAgYXV0 byBkZWNvZGVySWRlbnRpZmllciA9IGRlY29kZXItPmlkZW50aWZpZXI7CiAgICAgICAgIEFTU0VS VCghbV9kZWNvZGVycy5jb250YWlucyhkZWNvZGVySWRlbnRpZmllcikpOwpAQCAtMjczLDYgKzI3 OCw4IEBAIExpYldlYlJUQ0NvZGVjczo6RGVjb2RlciogTGliV2ViUlRDQ29kZWNzOjpjcmVhdGVE ZWNvZGVyKFR5cGUgdHlwZSkKIAogaW50MzJfdCBMaWJXZWJSVENDb2RlY3M6OnJlbGVhc2VEZWNv ZGVyKERlY29kZXImIGRlY29kZXIpCiB7CisgICAgQVNTRVJUKCFpc01haW5SdW5Mb29wKCkpOwor CiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICB7CiAgICAgICAgIExvY2tlciBsb2NrZXIgeyBkZWNv ZGVyLmRlY29kZWRJbWFnZUNhbGxiYWNrTG9jayB9OwpAQCAtMjgwLDkgKzI4NywxMiBAQCBpbnQz Ml90IExpYldlYlJUQ0NvZGVjczo6cmVsZWFzZURlY29kZXIoRGVjb2RlciYgZGVjb2RlcikKICAg ICB9CiAjZW5kaWYKICAgICBlbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbkFuZERpc3BhdGNoVG9U aHJlYWQoW3RoaXMsIGRlY29kZXJJZGVudGlmaWVyID0gZGVjb2Rlci5pZGVudGlmaWVyXSB7Cisg ICAgICAgIGFzc2VydElzQ3VycmVudCh3b3JrUXVldWUoKSk7CisKICAgICAgICAgQVNTRVJUKG1f ZGVjb2RlcnMuY29udGFpbnMoZGVjb2RlcklkZW50aWZpZXIpKTsKICAgICAgICAgaWYgKGF1dG8g ZGVjb2RlciA9IG1fZGVjb2RlcnMudGFrZShkZWNvZGVySWRlbnRpZmllcikpIHsKLSAgICAgICAg ICAgIGRlY29kZXItPmNvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ0NvZGVjc1By b3h5OjpSZWxlYXNlRGVjb2RlciB7IGRlY29kZXJJZGVudGlmaWVyIH0sIDApOworICAgICAgICAg ICAgTG9ja2VyIGxvY2tlciB7IG1fY29ubmVjdGlvbkxvY2sgfTsKKyAgICAgICAgICAgIGRlY29k ZXJDb25uZWN0aW9uKCpkZWNvZGVyKS0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJv eHk6OlJlbGVhc2VEZWNvZGVyIHsgZGVjb2RlcklkZW50aWZpZXIgfSwgMCk7CiAgICAgICAgICAg ICBncHVQcm9jZXNzQ29ubmVjdGlvbk1heU5vTG9uZ2VyQmVOZWVkZWQoKTsKICAgICAgICAgfQog ICAgIH0pOwpAQCAtMjkxLDYgKzMwMSw4IEBAIGludDMyX3QgTGliV2ViUlRDQ29kZWNzOjpyZWxl YXNlRGVjb2RlcihEZWNvZGVyJiBkZWNvZGVyKQogCiBpbnQzMl90IExpYldlYlJUQ0NvZGVjczo6 ZGVjb2RlRnJhbWUoRGVjb2RlciYgZGVjb2RlciwgdWludDMyX3QgdGltZVN0YW1wLCBjb25zdCB1 aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6ZSwgdWludDE2X3Qgd2lkdGgsIHVpbnQxNl90IGhlaWdo dCkKIHsKKyAgICBBU1NFUlQoIWlzTWFpblJ1bkxvb3AoKSk7CisKICAgICBMb2NrZXIgbG9ja2Vy IHsgbV9jb25uZWN0aW9uTG9jayB9OwogICAgIGlmICghZGVjb2Rlci5jb25uZWN0aW9uIHx8IGRl Y29kZXIuaGFzRXJyb3IpIHsKICAgICAgICAgZGVjb2Rlci5oYXNFcnJvciA9IGZhbHNlOwpAQCAt MzA2LDEzICszMTgsMTUgQEAgaW50MzJfdCBMaWJXZWJSVENDb2RlY3M6OmRlY29kZUZyYW1lKERl Y29kZXImIGRlY29kZXIsIHVpbnQzMl90IHRpbWVTdGFtcCwgY29uc3QKIAogdm9pZCBMaWJXZWJS VENDb2RlY3M6OnJlZ2lzdGVyRGVjb2RlRnJhbWVDYWxsYmFjayhEZWNvZGVyJiBkZWNvZGVyLCB2 b2lkKiBkZWNvZGVkSW1hZ2VDYWxsYmFjaykKIHsKKyAgICBBU1NFUlQoIWlzTWFpblJ1bkxvb3Ao KSk7CisKICAgICBMb2NrZXIgbG9ja2VyIHsgZGVjb2Rlci5kZWNvZGVkSW1hZ2VDYWxsYmFja0xv Y2sgfTsKICAgICBkZWNvZGVyLmRlY29kZWRJbWFnZUNhbGxiYWNrID0gZGVjb2RlZEltYWdlQ2Fs bGJhY2s7CiB9CiAKIHZvaWQgTGliV2ViUlRDQ29kZWNzOjpmYWlsZWREZWNvZGluZyhSVENEZWNv ZGVySWRlbnRpZmllciBkZWNvZGVySWRlbnRpZmllcikKIHsKLSAgICBBU1NFUlQoIWlzTWFpblJ1 bkxvb3AoKSk7CisgICAgYXNzZXJ0SXNDdXJyZW50KHdvcmtRdWV1ZSgpKTsKIAogICAgIGlmIChh dXRvKiBkZWNvZGVyID0gbV9kZWNvZGVycy5nZXQoZGVjb2RlcklkZW50aWZpZXIpKQogICAgICAg ICBkZWNvZGVyLT5oYXNFcnJvciA9IHRydWU7CkBAIC0zMjAsNyArMzM0LDggQEAgdm9pZCBMaWJX ZWJSVENDb2RlY3M6OmZhaWxlZERlY29kaW5nKFJUQ0RlY29kZXJJZGVudGlmaWVyIGRlY29kZXJJ ZGVudGlmaWVyKQogCiB2b2lkIExpYldlYlJUQ0NvZGVjczo6Y29tcGxldGVkRGVjb2RpbmcoUlRD RGVjb2RlcklkZW50aWZpZXIgZGVjb2RlcklkZW50aWZpZXIsIHVpbnQzMl90IHRpbWVTdGFtcCwg UmVtb3RlVmlkZW9GcmFtZVByb3h5OjpQcm9wZXJ0aWVzJiYgcHJvcGVydGllcykKIHsKLSAgICBB U1NFUlQoIWlzTWFpblJ1bkxvb3AoKSk7CisgICAgYXNzZXJ0SXNDdXJyZW50KHdvcmtRdWV1ZSgp KTsKKwogICAgIC8vIEFkb3B0IFJlbW90ZVZpZGVvRnJhbWVQcm94eTo6UHJvcGVydGllcyB0byBS ZW1vdGVWaWRlb0ZyYW1lUHJveHkgaW5zdGFuY2UgYmVmb3JlIHRoZSBlYXJseSBvdXRzLCBzbyB0 aGF0IHRoZSByZWZlcmVuY2UgZ2V0cyBhZG9wdGVkLgogICAgIC8vIFR5cGljYWxseSBSZW1vdGVW aWRlb0ZyYW1lUHJveHk6OlByb3BlcnRpZXMmJiBzZW50IHRvIGRlc3RpbmF0aW9ucyB0aGF0IGFy ZSBhbHJlYWR5IHJlbW92ZWQgbmVlZCB0byBiZSBoYW5kbGVkIHNlcGFyYXRlbHkuCiAgICAgLy8g TGliV2ViUlRDQ29kZWNzIGlzIG5vdCBldmVyIHJlbW92ZWQsIHNvIHdlIGRvIG5vdCBkbyB0aGlz LiBIb3dldmVyLCBpZiBpdCBldmVyIGlzLCBMaWJXZWJSVENDb2RlY3M6OmhhbmRsZU1lc3NhZ2VU b1JlbW92ZWREZXN0aW5hdGlvbigpCkBAIC0zNDcsNyArMzYyLDggQEAgdm9pZCBMaWJXZWJSVEND b2RlY3M6OmNvbXBsZXRlZERlY29kaW5nKFJUQ0RlY29kZXJJZGVudGlmaWVyIGRlY29kZXJJZGVu dGlmaWVyLAogCiB2b2lkIExpYldlYlJUQ0NvZGVjczo6Y29tcGxldGVkRGVjb2RpbmdDVihSVENE ZWNvZGVySWRlbnRpZmllciBkZWNvZGVySWRlbnRpZmllciwgdWludDMyX3QgdGltZVN0YW1wLCBX ZWJDb3JlOjpSZW1vdGVWaWRlb1NhbXBsZSYmIHJlbW90ZVNhbXBsZSkKIHsKLSAgICBBU1NFUlQo IWlzTWFpblJ1bkxvb3AoKSk7CisgICAgYXNzZXJ0SXNDdXJyZW50KHdvcmtRdWV1ZSgpKTsKKwog ICAgIC8vIEZJWE1FOiBEbyBlcnJvciBsb2dnaW5nLgogICAgIGF1dG8qIGRlY29kZXIgPSBtX2Rl Y29kZXJzLmdldChkZWNvZGVySWRlbnRpZmllcik7CiAgICAgaWYgKCFkZWNvZGVyKQpAQCAtMzkz LDYgKzQwOSw4IEBAIHN0YXRpYyBpbmxpbmUgd2VicnRjOjpWaWRlb0NvZGVjVHlwZSB0b1dlYlJU Q0NvZGVjVHlwZShMaWJXZWJSVENDb2RlY3M6OlR5cGUgdHlwCiAKIExpYldlYlJUQ0NvZGVjczo6 RW5jb2RlciogTGliV2ViUlRDQ29kZWNzOjpjcmVhdGVFbmNvZGVyKFR5cGUgdHlwZSwgY29uc3Qg c3RkOjptYXA8c3RkOjpzdHJpbmcsIHN0ZDo6c3RyaW5nPiYgZm9ybWF0UGFyYW1ldGVycykKIHsK KyAgICBBU1NFUlQoIWlzTWFpblJ1bkxvb3AoKSk7CisKICAgICBhdXRvIGVuY29kZXIgPSBtYWtl VW5pcXVlPEVuY29kZXI+KCk7CiAgICAgYXV0byogcmVzdWx0ID0gZW5jb2Rlci5nZXQoKTsKICAg ICBlbmNvZGVyLT5pZGVudGlmaWVyID0gUlRDRW5jb2RlcklkZW50aWZpZXI6OmdlbmVyYXRlVGhy ZWFkU2FmZSgpOwpAQCAtNDAzLDE1ICs0MjEsMjAgQEAgTGliV2ViUlRDQ29kZWNzOjpFbmNvZGVy KiBMaWJXZWJSVENDb2RlY3M6OmNyZWF0ZUVuY29kZXIoVHlwZSB0eXBlLCBjb25zdCBzdGQ6Om0K ICAgICB9KTsKIAogICAgIGVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uQW5kRGlzcGF0Y2hUb1Ro cmVhZChbdGhpcywgZW5jb2RlciA9IFdURk1vdmUoZW5jb2RlciksIHR5cGUsIHBhcmFtZXRlcnMg PSBXVEZNb3ZlKHBhcmFtZXRlcnMpXSgpIG11dGFibGUgewotICAgICAgICB7CisgICAgICAgIGFz c2VydElzQ3VycmVudCh3b3JrUXVldWUoKSk7CisKKyAgICAgICAgYXV0byBjb25uZWN0aW9uID0g WyZdKCkgLT4gUmVmPElQQzo6Q29ubmVjdGlvbj4gewogICAgICAgICAgICAgTG9ja2VyIGxvY2tl ciB7IG1fY29ubmVjdGlvbkxvY2sgfTsKLSAgICAgICAgICAgIGVuY29kZXItPmNvbm5lY3Rpb24g PSBtX2Nvbm5lY3Rpb247CisgICAgICAgICAgICByZXR1cm4gKm1fY29ubmVjdGlvbjsKKyAgICAg ICAgfSgpOworCisgICAgICAgIHsKKyAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBtX2VuY29k ZXJzQ29ubmVjdGlvbkxvY2sgfTsKKyAgICAgICAgICAgIGNvbm5lY3Rpb24tPnNlbmQoTWVzc2Fn ZXM6OkxpYldlYlJUQ0NvZGVjc1Byb3h5OjpDcmVhdGVFbmNvZGVyIHsgZW5jb2Rlci0+aWRlbnRp ZmllciwgZm9ybWF0TmFtZUZyb21Db2RlY1R5cGUodHlwZSksIHBhcmFtZXRlcnMsIFJ1bnRpbWVF bmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkud2ViUlRDSDI2NExvd0xhdGVuY3lFbmNv ZGVyRW5hYmxlZCgpIH0sIDApOworICAgICAgICAgICAgc2V0RW5jb2RlckNvbm5lY3Rpb24oKmVu Y29kZXIsIGNvbm5lY3Rpb24ucHRyKCkpOwogICAgICAgICB9CiAKLSAgICAgICAgZW5jb2Rlci0+ Y29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6OkNyZWF0ZUVu Y29kZXIgeyBlbmNvZGVyLT5pZGVudGlmaWVyLCBmb3JtYXROYW1lRnJvbUNvZGVjVHlwZSh0eXBl KSwgcGFyYW1ldGVycywgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS53 ZWJSVENIMjY0TG93TGF0ZW5jeUVuY29kZXJFbmFibGVkKCkgfSwgMCk7CiAgICAgICAgIGVuY29k ZXItPnBhcmFtZXRlcnMgPSBXVEZNb3ZlKHBhcmFtZXRlcnMpOwotCi0gICAgICAgIExvY2tlciBs b2NrZXIgeyBtX2VuY29kZXJzTG9jayB9OwogICAgICAgICBhdXRvIGVuY29kZXJJZGVudGlmaWVy ID0gZW5jb2Rlci0+aWRlbnRpZmllcjsKICAgICAgICAgQVNTRVJUKCFtX2VuY29kZXJzLmNvbnRh aW5zKGVuY29kZXJJZGVudGlmaWVyKSk7CiAgICAgICAgIG1fZW5jb2RlcnMuYWRkKGVuY29kZXJJ ZGVudGlmaWVyLCBXVEZNb3ZlKGVuY29kZXIpKTsKQEAgLTQyMSw2ICs0NDQsOCBAQCBMaWJXZWJS VENDb2RlY3M6OkVuY29kZXIqIExpYldlYlJUQ0NvZGVjczo6Y3JlYXRlRW5jb2RlcihUeXBlIHR5 cGUsIGNvbnN0IHN0ZDo6bQogCiBpbnQzMl90IExpYldlYlJUQ0NvZGVjczo6cmVsZWFzZUVuY29k ZXIoRW5jb2RlciYgZW5jb2RlcikKIHsKKyAgICBBU1NFUlQoIWlzTWFpblJ1bkxvb3AoKSk7CisK ICNpZiBBU1NFUlRfRU5BQkxFRAogICAgIHsKICAgICAgICAgTG9ja2VyIGxvY2tlciB7IGVuY29k ZXIuZW5jb2RlZEltYWdlQ2FsbGJhY2tMb2NrIH07CkBAIC00MjgsMTAgKzQ1MywxNCBAQCBpbnQz Ml90IExpYldlYlJUQ0NvZGVjczo6cmVsZWFzZUVuY29kZXIoRW5jb2RlciYgZW5jb2RlcikKICAg ICB9CiAjZW5kaWYKICAgICBlbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbkFuZERpc3BhdGNoVG9U aHJlYWQoW3RoaXMsIGVuY29kZXJJZGVudGlmaWVyID0gZW5jb2Rlci5pZGVudGlmaWVyXSB7Ci0g ICAgICAgIExvY2tlciBsb2NrZXIgeyBtX2VuY29kZXJzTG9jayB9OworICAgICAgICBhc3NlcnRJ c0N1cnJlbnQod29ya1F1ZXVlKCkpOworCiAgICAgICAgIEFTU0VSVChtX2VuY29kZXJzLmNvbnRh aW5zKGVuY29kZXJJZGVudGlmaWVyKSk7CiAgICAgICAgIGF1dG8gZW5jb2RlciA9IG1fZW5jb2Rl cnMudGFrZShlbmNvZGVySWRlbnRpZmllcik7Ci0gICAgICAgIGVuY29kZXItPmNvbm5lY3Rpb24t PnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ0NvZGVjc1Byb3h5OjpSZWxlYXNlRW5jb2RlciB7IGVu Y29kZXJJZGVudGlmaWVyIH0sIDApOworCisgICAgICAgIExvY2tlciBsb2NrZXIgeyBtX2VuY29k ZXJzQ29ubmVjdGlvbkxvY2sgfTsKKyAgICAgICAgZW5jb2RlckNvbm5lY3Rpb24oKmVuY29kZXIp LT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENDb2RlY3NQcm94eTo6UmVsZWFzZUVuY29kZXIgeyBl bmNvZGVySWRlbnRpZmllciB9LCAwKTsKKwogICAgICAgICBncHVQcm9jZXNzQ29ubmVjdGlvbk1h eU5vTG9uZ2VyQmVOZWVkZWQoKTsKICAgICB9KTsKICAgICByZXR1cm4gMDsKQEAgLTQzOSwyNyAr NDY4LDM2IEBAIGludDMyX3QgTGliV2ViUlRDQ29kZWNzOjpyZWxlYXNlRW5jb2RlcihFbmNvZGVy JiBlbmNvZGVyKQogCiBpbnQzMl90IExpYldlYlJUQ0NvZGVjczo6aW5pdGlhbGl6ZUVuY29kZXIo RW5jb2RlciYgZW5jb2RlciwgdWludDE2X3Qgd2lkdGgsIHVpbnQxNl90IGhlaWdodCwgdW5zaWdu ZWQgc3RhcnRCaXRSYXRlLCB1bnNpZ25lZCBtYXhCaXRSYXRlLCB1bnNpZ25lZCBtaW5CaXRSYXRl LCB1aW50MzJfdCBtYXhGcmFtZVJhdGUpCiB7CisgICAgQVNTRVJUKCFpc01haW5SdW5Mb29wKCkp OworCiAgICAgZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb25BbmREaXNwYXRjaFRvVGhyZWFkKFt0 aGlzLCBlbmNvZGVySWRlbnRpZmllciA9IGVuY29kZXIuaWRlbnRpZmllciwgd2lkdGgsIGhlaWdo dCwgc3RhcnRCaXRSYXRlLCBtYXhCaXRSYXRlLCBtaW5CaXRSYXRlLCBtYXhGcmFtZVJhdGVdKCkg bXV0YWJsZSB7CisgICAgICAgIGFzc2VydElzQ3VycmVudCh3b3JrUXVldWUoKSk7CisKICAgICAg ICAgYXV0byogZW5jb2RlciA9IG1fZW5jb2RlcnMuZ2V0KGVuY29kZXJJZGVudGlmaWVyKTsKICAg ICAgICAgZW5jb2Rlci0+aW5pdGlhbGl6YXRpb25EYXRhID0gRW5jb2RlckluaXRpYWxpemF0aW9u RGF0YSB7IHdpZHRoLCBoZWlnaHQsIHN0YXJ0Qml0UmF0ZSwgbWF4Qml0UmF0ZSwgbWluQml0UmF0 ZSwgbWF4RnJhbWVSYXRlIH07Ci0gICAgICAgIGVuY29kZXItPmNvbm5lY3Rpb24tPnNlbmQoTWVz c2FnZXM6OkxpYldlYlJUQ0NvZGVjc1Byb3h5OjpJbml0aWFsaXplRW5jb2RlciB7IGVuY29kZXJJ ZGVudGlmaWVyLCB3aWR0aCwgaGVpZ2h0LCBzdGFydEJpdFJhdGUsIG1heEJpdFJhdGUsIG1pbkJp dFJhdGUsIG1heEZyYW1lUmF0ZSB9LCAwKTsKKworICAgICAgICBMb2NrZXIgbG9ja2VyIHsgbV9l bmNvZGVyc0Nvbm5lY3Rpb25Mb2NrIH07CisgICAgICAgIGVuY29kZXJDb25uZWN0aW9uKCplbmNv ZGVyKS0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6OkluaXRpYWxpemVFbmNv ZGVyIHsgZW5jb2RlcklkZW50aWZpZXIsIHdpZHRoLCBoZWlnaHQsIHN0YXJ0Qml0UmF0ZSwgbWF4 Qml0UmF0ZSwgbWluQml0UmF0ZSwgbWF4RnJhbWVSYXRlIH0sIDApOwogICAgIH0pOwogICAgIHJl dHVybiAwOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBCdWZmZXI+Ci1ib29sIGNvcHlTaGFyZWRW aWRlb0ZyYW1lKExpYldlYlJUQ0NvZGVjczo6RW5jb2RlciYgZW5jb2RlciwgQnVmZmVyJiYgZnJh bWVCdWZmZXIpCitib29sIExpYldlYlJUQ0NvZGVjczo6Y29weVNoYXJlZFZpZGVvRnJhbWUoTGli V2ViUlRDQ29kZWNzOjpFbmNvZGVyJiBlbmNvZGVyLCBJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rp b24sIEJ1ZmZlciYmIGZyYW1lQnVmZmVyKQogewogICAgIHJldHVybiBlbmNvZGVyLnNoYXJlZFZp ZGVvRnJhbWVXcml0ZXIud3JpdGUoZnJhbWVCdWZmZXIsCi0gICAgICAgIFsmXShhdXRvJiBzZW1h cGhvcmUpIHsgZW5jb2Rlci5jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENDb2Rl Y3NQcm94eTo6U2V0U2hhcmVkVmlkZW9GcmFtZVNlbWFwaG9yZSB7IGVuY29kZXIuaWRlbnRpZmll ciwgc2VtYXBob3JlIH0sIDApOyB9LAotICAgICAgICBbJl0oYXV0byYgaGFuZGxlKSB7IGVuY29k ZXIuY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6OlNldFNo YXJlZFZpZGVvRnJhbWVNZW1vcnkgeyBlbmNvZGVyLmlkZW50aWZpZXIsIGhhbmRsZSB9LCAwKTsg fQorICAgICAgICBbJl0oYXV0byYgc2VtYXBob3JlKSB7IGNvbm5lY3Rpb24uc2VuZChNZXNzYWdl czo6TGliV2ViUlRDQ29kZWNzUHJveHk6OlNldFNoYXJlZFZpZGVvRnJhbWVTZW1hcGhvcmUgeyBl bmNvZGVyLmlkZW50aWZpZXIsIHNlbWFwaG9yZSB9LCAwKTsgfSwKKyAgICAgICAgWyZdKGF1dG8m IGhhbmRsZSkgeyBjb25uZWN0aW9uLnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ0NvZGVjc1Byb3h5 OjpTZXRTaGFyZWRWaWRlb0ZyYW1lTWVtb3J5IHsgZW5jb2Rlci5pZGVudGlmaWVyLCBoYW5kbGUg fSwgMCk7IH0KICAgICApOwogfQogCiBpbnQzMl90IExpYldlYlJUQ0NvZGVjczo6ZW5jb2RlRnJh bWUoRW5jb2RlciYgZW5jb2RlciwgY29uc3Qgd2VicnRjOjpWaWRlb0ZyYW1lJiBmcmFtZSwgYm9v bCBzaG91bGRFbmNvZGVBc0tleUZyYW1lKQogewotICAgIExvY2tlciBsb2NrZXIgeyBtX2VuY29k ZXJzTG9jayB9OwotICAgIGlmICghZW5jb2Rlci5jb25uZWN0aW9uKQorICAgIEFTU0VSVCghaXNN YWluUnVuTG9vcCgpKTsKKworICAgIExvY2tlciBsb2NrZXIgeyBtX2VuY29kZXJzQ29ubmVjdGlv bkxvY2sgfTsKKyAgICBhdXRvKiBjb25uZWN0aW9uID0gZW5jb2RlckNvbm5lY3Rpb24oZW5jb2Rl cik7CisgICAgaWYgKCFjb25uZWN0aW9uKQogICAgICAgICByZXR1cm4gV0VCUlRDX1ZJREVPX0NP REVDX0VSUk9SOwogCiAgICAgc3RkOjpvcHRpb25hbDxSZW1vdGVWaWRlb0ZyYW1lUmVhZFJlZmVy ZW5jZT4gcmVtb3RlVmlkZW9GcmFtZVJlYWRSZWZlcmVuY2U7CkBAIC00NzQsNyArNTEyLDcgQEAg aW50MzJfdCBMaWJXZWJSVENDb2RlY3M6OmVuY29kZUZyYW1lKEVuY29kZXImIGVuY29kZXIsIGNv bnN0IHdlYnJ0Yzo6VmlkZW9GcmFtZSYKICAgICAgICAgYnVmZmVyID0gYWRvcHRDRih3ZWJydGM6 OnBpeGVsQnVmZmVyRnJvbUZyYW1lKGZyYW1lKSk7CiAgICAgICAgIGlmICghYnVmZmVyKSB7CiAg ICAgICAgICAgICAvLyBidWZmZXIgaXMgbm90IG5hdGl2ZSwgd2UgbmVlZCB0byBjb3B5IHRvIHNo YXJlZCB2aWRlbyBmcmFtZS4KLSAgICAgICAgICAgIGlmICghY29weVNoYXJlZFZpZGVvRnJhbWUo ZW5jb2RlciwgZnJhbWUpKQorICAgICAgICAgICAgaWYgKCFjb3B5U2hhcmVkVmlkZW9GcmFtZShl bmNvZGVyLCAqY29ubmVjdGlvbiwgZnJhbWUpKQogICAgICAgICAgICAgICAgIHJldHVybiBXRUJS VENfVklERU9fQ09ERUNfRVJST1I7CiAgICAgICAgIH0KICAgICB9CkBAIC00ODIsMTYgKzUyMCwx OCBAQCBpbnQzMl90IExpYldlYlJUQ0NvZGVjczo6ZW5jb2RlRnJhbWUoRW5jb2RlciYgZW5jb2Rl ciwgY29uc3Qgd2VicnRjOjpWaWRlb0ZyYW1lJgogICAgIGF1dG8gc2FtcGxlID0gUmVtb3RlVmlk ZW9TYW1wbGU6OmNyZWF0ZShidWZmZXIuZ2V0KCksIE1lZGlhVGltZShmcmFtZS50aW1lc3RhbXBf dXMoKSAqIDEwMDAsIDEwMDAwMDApLCB0b01lZGlhU2FtcGxlVmlkZW9Sb3RhdGlvbihmcmFtZS5y b3RhdGlvbigpKSwgUmVtb3RlVmlkZW9TYW1wbGU6OlNob3VsZENoZWNrRm9ySU9TdXJmYWNlOjpO byk7CiAgICAgaWYgKGJ1ZmZlciAmJiAhc2FtcGxlLT5zdXJmYWNlKCkpIHsKICAgICAgICAgLy8g YnVmZmVyIGlzIG5vdCBJT1N1cmZhY2UsIHdlIG5lZWQgdG8gY29weSB0byBzaGFyZWQgdmlkZW8g ZnJhbWUuCi0gICAgICAgIGlmICghY29weVNoYXJlZFZpZGVvRnJhbWUoZW5jb2RlciwgYnVmZmVy LmdldCgpKSkKKyAgICAgICAgaWYgKCFjb3B5U2hhcmVkVmlkZW9GcmFtZShlbmNvZGVyLCAqY29u bmVjdGlvbiwgYnVmZmVyLmdldCgpKSkKICAgICAgICAgICAgIHJldHVybiBXRUJSVENfVklERU9f Q09ERUNfRVJST1I7CiAgICAgfQogCi0gICAgZW5jb2Rlci5jb25uZWN0aW9uLT5zZW5kKE1lc3Nh Z2VzOjpMaWJXZWJSVENDb2RlY3NQcm94eTo6RW5jb2RlRnJhbWUgeyBlbmNvZGVyLmlkZW50aWZp ZXIsICpzYW1wbGUsIGZyYW1lLnRpbWVzdGFtcCgpLCBzaG91bGRFbmNvZGVBc0tleUZyYW1lLCBy ZW1vdGVWaWRlb0ZyYW1lUmVhZFJlZmVyZW5jZSB9LCAwKTsKKyAgICBjb25uZWN0aW9uLT5zZW5k KE1lc3NhZ2VzOjpMaWJXZWJSVENDb2RlY3NQcm94eTo6RW5jb2RlRnJhbWUgeyBlbmNvZGVyLmlk ZW50aWZpZXIsICpzYW1wbGUsIGZyYW1lLnRpbWVzdGFtcCgpLCBzaG91bGRFbmNvZGVBc0tleUZy YW1lLCByZW1vdGVWaWRlb0ZyYW1lUmVhZFJlZmVyZW5jZSB9LCAwKTsKICAgICByZXR1cm4gV0VC UlRDX1ZJREVPX0NPREVDX09LOwogfQogCiB2b2lkIExpYldlYlJUQ0NvZGVjczo6cmVnaXN0ZXJF bmNvZGVGcmFtZUNhbGxiYWNrKEVuY29kZXImIGVuY29kZXIsIHZvaWQqIGVuY29kZWRJbWFnZUNh bGxiYWNrKQogeworICAgIEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKKwogICAgIExvY2tlciBs b2NrZXIgeyBlbmNvZGVyLmVuY29kZWRJbWFnZUNhbGxiYWNrTG9jayB9OwogCiAgICAgZW5jb2Rl ci5lbmNvZGVkSW1hZ2VDYWxsYmFjayA9IGVuY29kZWRJbWFnZUNhbGxiYWNrOwpAQCAtNDk5LDIw ICs1MzksMjMgQEAgdm9pZCBMaWJXZWJSVENDb2RlY3M6OnJlZ2lzdGVyRW5jb2RlRnJhbWVDYWxs YmFjayhFbmNvZGVyJiBlbmNvZGVyLCB2b2lkKiBlbmNvZGUKIAogdm9pZCBMaWJXZWJSVENDb2Rl Y3M6OnNldEVuY29kZVJhdGVzKEVuY29kZXImIGVuY29kZXIsIHVpbnQzMl90IGJpdFJhdGUsIHVp bnQzMl90IGZyYW1lUmF0ZSkKIHsKLSAgICBMb2NrZXIgbG9ja2VyIHsgbV9lbmNvZGVyc0xvY2sg fTsKKyAgICBBU1NFUlQoIWlzTWFpblJ1bkxvb3AoKSk7CiAKLSAgICBpZiAoIWVuY29kZXIuY29u bmVjdGlvbikgeworICAgIExvY2tlciBsb2NrZXIgeyBtX2VuY29kZXJzQ29ubmVjdGlvbkxvY2sg fTsKKworICAgIGF1dG8qIGNvbm5lY3Rpb24gPSBlbmNvZGVyQ29ubmVjdGlvbihlbmNvZGVyKTsK KyAgICBpZiAoIWNvbm5lY3Rpb24pIHsKICAgICAgICAgY2FsbE9uTWFpblJ1bkxvb3AoW2VuY29k ZXJJZGVudGlmaWVyID0gZW5jb2Rlci5pZGVudGlmaWVyLCBiaXRSYXRlLCBmcmFtZVJhdGVdIHsK ICAgICAgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZUdQVVByb2Nlc3NDb25u ZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ0NvZGVjc1Byb3h5 OjpTZXRFbmNvZGVSYXRlcyB7IGVuY29kZXJJZGVudGlmaWVyLCBiaXRSYXRlLCBmcmFtZVJhdGUg fSwgMCk7CiAgICAgICAgIH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGVuY29kZXIu Y29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6OlNldEVuY29k ZVJhdGVzIHsgZW5jb2Rlci5pZGVudGlmaWVyLCBiaXRSYXRlLCBmcmFtZVJhdGUgfSwgMCk7Cisg ICAgY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6OlNldEVu Y29kZVJhdGVzIHsgZW5jb2Rlci5pZGVudGlmaWVyLCBiaXRSYXRlLCBmcmFtZVJhdGUgfSwgMCk7 CiB9CiAKIHZvaWQgTGliV2ViUlRDQ29kZWNzOjpjb21wbGV0ZWRFbmNvZGluZyhSVENFbmNvZGVy SWRlbnRpZmllciBpZGVudGlmaWVyLCBJUEM6OkRhdGFSZWZlcmVuY2UmJiBkYXRhLCBjb25zdCB3 ZWJydGM6OldlYktpdEVuY29kZWRGcmFtZUluZm8mIGluZm8pCiB7Ci0gICAgQVNTRVJUKCFpc01h aW5SdW5Mb29wKCkpOworICAgIGFzc2VydElzQ3VycmVudCh3b3JrUXVldWUoKSk7CiAKICAgICAv LyBGSVhNRTogRG8gZXJyb3IgbG9nZ2luZy4KICAgICBhdXRvKiBlbmNvZGVyID0gbV9lbmNvZGVy cy5nZXQoaWRlbnRpZmllcik7CkBAIC01NTMsNiArNTk2LDcgQEAgdm9pZCBMaWJXZWJSVENDb2Rl Y3M6OmRpc3BhdGNoVG9UaHJlYWQoRnVuY3Rpb248dm9pZCgpPiYmIGNhbGxiYWNrKQogdm9pZCBM aWJXZWJSVENDb2RlY3M6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nv bm5lY3Rpb24mKQogewogICAgIEFTU0VSVChpc01haW5SdW5Mb29wKCkpOworCiAgICAgTG9ja2Vy IGxvY2tlciB7IG1fY29ubmVjdGlvbkxvY2sgfTsKICAgICBzdGQ6OmV4Y2hhbmdlKG1fY29ubmVj dGlvbiwgbnVsbHB0ciktPnJlbW92ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6TGli V2ViUlRDQ29kZWNzOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOwogICAgIGlmICghbV9uZWVkc0dQ VVByb2Nlc3NDb25uZWN0aW9uKQpAQCAtNTYwLDIxICs2MDQsMjUgQEAgdm9pZCBMaWJXZWJSVEND b2RlY3M6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24m KQogCiAgICAgZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb25Pbk1haW5UaHJlYWRXaXRoTG9jaygp OwogICAgIGRpc3BhdGNoVG9UaHJlYWQoW3RoaXMsIGNvbm5lY3Rpb24gPSBtX2Nvbm5lY3Rpb25d KCkgewotICAgICAgICBmb3IgKGF1dG8mIGRlY29kZXIgOiBtX2RlY29kZXJzLnZhbHVlcygpKSB7 Ci0gICAgICAgICAgICBjcmVhdGVSZW1vdGVEZWNvZGVyKCpkZWNvZGVyLCAqY29ubmVjdGlvbiwg bV91c2VSZW1vdGVGcmFtZXMpOwotICAgICAgICAgICAgZGVjb2Rlci0+Y29ubmVjdGlvbiA9IGNv bm5lY3Rpb24uZ2V0KCk7CisgICAgICAgIGFzc2VydElzQ3VycmVudCh3b3JrUXVldWUoKSk7Cisg ICAgICAgIHsKKyAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBtX2Nvbm5lY3Rpb25Mb2NrIH07 CisgICAgICAgICAgICBmb3IgKGF1dG8mIGRlY29kZXIgOiBtX2RlY29kZXJzLnZhbHVlcygpKSB7 CisgICAgICAgICAgICAgICAgY3JlYXRlUmVtb3RlRGVjb2RlcigqZGVjb2RlciwgKmNvbm5lY3Rp b24sIG1fdXNlUmVtb3RlRnJhbWVzKTsKKyAgICAgICAgICAgICAgICBzZXREZWNvZGVyQ29ubmVj dGlvbigqZGVjb2RlciwgY29ubmVjdGlvbi5nZXQoKSk7CisgICAgICAgICAgICB9CiAgICAgICAg IH0KIAogICAgICAgICAvLyBJbiBjYXNlIHdlIGFyZSB3YWl0aW5nIGZvciBHUFVQcm9jZXNzLCBs ZXQncyBlbmQgdGhlIHdhaXQgdG8gbm90IGRlYWRsb2NrLgogICAgICAgICBmb3IgKGF1dG8mIGVu Y29kZXIgOiBtX2VuY29kZXJzLnZhbHVlcygpKQogICAgICAgICAgICAgZW5jb2Rlci0+c2hhcmVk VmlkZW9GcmFtZVdyaXRlci5kaXNhYmxlKCk7CiAKLSAgICAgICAgTG9ja2VyIGxvY2tlciB7IG1f ZW5jb2RlcnNMb2NrIH07CisgICAgICAgIExvY2tlciBsb2NrZXIgeyBtX2VuY29kZXJzQ29ubmVj dGlvbkxvY2sgfTsKICAgICAgICAgZm9yIChhdXRvJiBlbmNvZGVyIDogbV9lbmNvZGVycy52YWx1 ZXMoKSkgewogICAgICAgICAgICAgY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRD Q29kZWNzUHJveHk6OkNyZWF0ZUVuY29kZXIgeyBlbmNvZGVyLT5pZGVudGlmaWVyLCBmb3JtYXRO YW1lRnJvbVdlYlJUQ0NvZGVjVHlwZShlbmNvZGVyLT5jb2RlY1R5cGUpLCBlbmNvZGVyLT5wYXJh bWV0ZXJzLCBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLndlYlJUQ0gy NjRMb3dMYXRlbmN5RW5jb2RlckVuYWJsZWQoKSB9LCAwKTsKICAgICAgICAgICAgIGlmIChlbmNv ZGVyLT5pbml0aWFsaXphdGlvbkRhdGEpCiAgICAgICAgICAgICAgICAgY29ubmVjdGlvbi0+c2Vu ZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6OkluaXRpYWxpemVFbmNvZGVyIHsgZW5j b2Rlci0+aWRlbnRpZmllciwgZW5jb2Rlci0+aW5pdGlhbGl6YXRpb25EYXRhLT53aWR0aCwgZW5j b2Rlci0+aW5pdGlhbGl6YXRpb25EYXRhLT5oZWlnaHQsIGVuY29kZXItPmluaXRpYWxpemF0aW9u RGF0YS0+c3RhcnRCaXRSYXRlLCBlbmNvZGVyLT5pbml0aWFsaXphdGlvbkRhdGEtPm1heEJpdFJh dGUsIGVuY29kZXItPmluaXRpYWxpemF0aW9uRGF0YS0+bWluQml0UmF0ZSwgZW5jb2Rlci0+aW5p dGlhbGl6YXRpb25EYXRhLT5tYXhGcmFtZVJhdGUgfSwgMCk7Ci0gICAgICAgICAgICBlbmNvZGVy LT5jb25uZWN0aW9uID0gY29ubmVjdGlvbi5nZXQoKTsKKyAgICAgICAgICAgIHNldEVuY29kZXJD b25uZWN0aW9uKCplbmNvZGVyLCBjb25uZWN0aW9uLmdldCgpKTsKICAgICAgICAgICAgIGVuY29k ZXItPnNoYXJlZFZpZGVvRnJhbWVXcml0ZXIgPSB7IH07CiAgICAgICAgIH0KICAgICB9KTsKQEAg LTU4OSw2ICs2MzcsMjYgQEAgdm9pZCBMaWJXZWJSVENDb2RlY3M6OnNldExvZ2dpbmdMZXZlbChX VEZMb2dMZXZlbCBsZXZlbCkKICAgICAgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpM aWJXZWJSVENDb2RlY3NQcm94eTo6U2V0UlRDTG9nZ2luZ0xldmVsKGxldmVsKSwgMCk7CiB9CiAK K0lQQzo6Q29ubmVjdGlvbiogTGliV2ViUlRDQ29kZWNzOjplbmNvZGVyQ29ubmVjdGlvbihFbmNv ZGVyJiBlbmNvZGVyKQoreworICAgIHJldHVybiBlbmNvZGVyLmNvbm5lY3Rpb24uZ2V0KCk7Cit9 CisKK3ZvaWQgTGliV2ViUlRDQ29kZWNzOjpzZXRFbmNvZGVyQ29ubmVjdGlvbihFbmNvZGVyJiBl bmNvZGVyLCBSZWZQdHI8SVBDOjpDb25uZWN0aW9uPiYmIGNvbm5lY3Rpb24pCit7CisgICAgZW5j b2Rlci5jb25uZWN0aW9uID0gV1RGTW92ZShjb25uZWN0aW9uKTsKK30KKworSVBDOjpDb25uZWN0 aW9uKiBMaWJXZWJSVENDb2RlY3M6OmRlY29kZXJDb25uZWN0aW9uKERlY29kZXImIGRlY29kZXIp Cit7CisgICAgcmV0dXJuIGRlY29kZXIuY29ubmVjdGlvbi5nZXQoKTsKK30KKwordm9pZCBMaWJX ZWJSVENDb2RlY3M6OnNldERlY29kZXJDb25uZWN0aW9uKERlY29kZXImIGRlY29kZXIsIFJlZlB0 cjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKK3sKKyAgICBkZWNvZGVyLmNvbm5lY3Rp b24gPSBXVEZNb3ZlKGNvbm5lY3Rpb24pOworfQorCiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmggYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuaAppbmRl eCAzMWVkYzQwMDUxZmM4N2NjYzBkMDAyZGY1M2FlZmNiYjI4M2U5YTllLi4wM2NmOTllNTVjYTdi YjM4MTJhZjgxN2I1MWRmODFiYTEwZDgxNWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuaApAQCAtMTQ0LDEyICsxNDQs MTkgQEAgcHJpdmF0ZToKICAgICAvLyBHUFVQcm9jZXNzQ29ubmVjdGlvbjo6Q2xpZW50CiAgICAg dm9pZCBncHVQcm9jZXNzQ29ubmVjdGlvbkRpZENsb3NlKEdQVVByb2Nlc3NDb25uZWN0aW9uJik7 CiAKKyAgICBJUEM6OkNvbm5lY3Rpb24qIGVuY29kZXJDb25uZWN0aW9uKEVuY29kZXImKSBXVEZf UkVRVUlSRVNfTE9DSyhtX2VuY29kZXJzQ29ubmVjdGlvbkxvY2spOworICAgIHZvaWQgc2V0RW5j b2RlckNvbm5lY3Rpb24oRW5jb2RlciYsIFJlZlB0cjxJUEM6OkNvbm5lY3Rpb24+JiYpICBXVEZf UkVRVUlSRVNfTE9DSyhtX2VuY29kZXJzQ29ubmVjdGlvbkxvY2spOworICAgIElQQzo6Q29ubmVj dGlvbiogZGVjb2RlckNvbm5lY3Rpb24oRGVjb2RlciYpIFdURl9SRVFVSVJFU19MT0NLKG1fY29u bmVjdGlvbkxvY2spOworICAgIHZvaWQgc2V0RGVjb2RlckNvbm5lY3Rpb24oRGVjb2RlciYsIFJl ZlB0cjxJUEM6OkNvbm5lY3Rpb24+JiYpIFdURl9SRVFVSVJFU19MT0NLKG1fY29ubmVjdGlvbkxv Y2spOworCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgQnVmZmVyPiBib29sIGNvcHlTaGFyZWRWaWRl b0ZyYW1lKExpYldlYlJUQ0NvZGVjczo6RW5jb2RlciYsIElQQzo6Q29ubmVjdGlvbiYsIEJ1ZmZl ciYmKTsKKyAgICBXb3JrUXVldWUmIHdvcmtRdWV1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcXVldWU7 IH0KKwogcHJpdmF0ZToKLSAgICBIYXNoTWFwPFJUQ0RlY29kZXJJZGVudGlmaWVyLCBzdGQ6OnVu aXF1ZV9wdHI8RGVjb2Rlcj4+IG1fZGVjb2RlcnM7Ci0gICAgSGFzaFNldDxSVENEZWNvZGVySWRl bnRpZmllcj4gbV9kZWNvZGluZ0Vycm9yczsKKyAgICBIYXNoTWFwPFJUQ0RlY29kZXJJZGVudGlm aWVyLCBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rlcj4+IG1fZGVjb2RlcnMgV1RGX0dVQVJERURfQllf Q0FQQUJJTElUWSh3b3JrUXVldWUoKSk7CiAKLSAgICBMb2NrIG1fZW5jb2RlcnNMb2NrOwotICAg IEhhc2hNYXA8UlRDRW5jb2RlcklkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxFbmNvZGVyPj4g bV9lbmNvZGVyczsKKyAgICBMb2NrIG1fZW5jb2RlcnNDb25uZWN0aW9uTG9jazsKKyAgICBIYXNo TWFwPFJUQ0VuY29kZXJJZGVudGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8RW5jb2Rlcj4+IG1fZW5j b2RlcnMgV1RGX0dVQVJERURfQllfQ0FQQUJJTElUWSh3b3JrUXVldWUoKSk7CiAKICAgICBzdGQ6 OmF0b21pYzxib29sPiBtX25lZWRzR1BVUHJvY2Vzc0Nvbm5lY3Rpb247CiAK 453574 2022-03-01 23:22:27 -0800 2022-03-02 05:51:22 -0800 Patch bug-237321-20220302082223.patch text/plain 1703 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgxYmYwMTI0MTM3MGY0YTdh YWVkZTQwZWRkMWYyOGI4OTE2NGZiZjQuLjY4MjUxMGIwNzUzYzk3NzJlOTMxMGY1NDNjMGQ1NGNk N2FkYjU1YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDMtMDEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFubm90YXRlIExpYldlYlJUQyB3 aXRoIHRocmVhZCBzYWZldHkgbWFjcm9zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzczMjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg5NjI1NTc3 PgorCisgICAgICAgIFVucmV2aWV3ZWQsIGFkZHJlc3NpbmcgcG9zdCBjb21taXQgc3R5bGUgY2hh bmdlLgorICAgICAgICBObyBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmg6CisKIDIwMjItMDMtMDEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBNZWRpYVNhbXBsZUFW Rk9iakM6OmNyZWF0ZUltYWdlU2FtcGxlIHRvIE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlRnJv bVBpeGVsQnVmZmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL3dl YnJ0Yy9MaWJXZWJSVENDb2RlY3MuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2Vi cnRjL0xpYldlYlJUQ0NvZGVjcy5oCmluZGV4IDAzY2Y5OWU1NWNhN2JiMzgxMmFmODE3YjUxZGY4 MWJhMTBkODE1YzAuLmY0ZjNiYmVjNTczZTAzNzlkZWNhY2E3N2ZkZDYzNTI2Zjk1MzFmMzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0Nv ZGVjcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJU Q0NvZGVjcy5oCkBAIC0xNDUsNyArMTQ1LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGdwdVByb2Nl c3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24mKTsKIAogICAgIElQQzo6 Q29ubmVjdGlvbiogZW5jb2RlckNvbm5lY3Rpb24oRW5jb2RlciYpIFdURl9SRVFVSVJFU19MT0NL KG1fZW5jb2RlcnNDb25uZWN0aW9uTG9jayk7Ci0gICAgdm9pZCBzZXRFbmNvZGVyQ29ubmVjdGlv bihFbmNvZGVyJiwgUmVmUHRyPElQQzo6Q29ubmVjdGlvbj4mJikgIFdURl9SRVFVSVJFU19MT0NL KG1fZW5jb2RlcnNDb25uZWN0aW9uTG9jayk7CisgICAgdm9pZCBzZXRFbmNvZGVyQ29ubmVjdGlv bihFbmNvZGVyJiwgUmVmUHRyPElQQzo6Q29ubmVjdGlvbj4mJikgV1RGX1JFUVVJUkVTX0xPQ0so bV9lbmNvZGVyc0Nvbm5lY3Rpb25Mb2NrKTsKICAgICBJUEM6OkNvbm5lY3Rpb24qIGRlY29kZXJD b25uZWN0aW9uKERlY29kZXImKSBXVEZfUkVRVUlSRVNfTE9DSyhtX2Nvbm5lY3Rpb25Mb2NrKTsK ICAgICB2b2lkIHNldERlY29kZXJDb25uZWN0aW9uKERlY29kZXImLCBSZWZQdHI8SVBDOjpDb25u ZWN0aW9uPiYmKSBXVEZfUkVRVUlSRVNfTE9DSyhtX2Nvbm5lY3Rpb25Mb2NrKTsKIAo=