238858 2022-04-06 01:48:03 -0700 Media and WebRTC code uses ThreadMessageReceiverRefCounted with WorkQueues 2022-04-06 06:31:17 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kkinnunen kkinnunen cdumez webkit-bug-importer youennf oldest_to_newest 1858727 0 kkinnunen 2022-04-06 01:48:03 -0700 Media and WebRTC code uses ThreadMessageReceiverRefCounted with WorkQueues 1858729 1 456792 kkinnunen 2022-04-06 01:52:03 -0700 Created attachment 456792 Patch 1858742 2 456792 youennf 2022-04-06 02:46:28 -0700 Comment on attachment 456792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456792&action=review > Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.h:65 > + void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final; Can we keep it private? 1858761 3 456799 kkinnunen 2022-04-06 03:43:42 -0700 Created attachment 456799 For landing 1858801 4 ews-feeder 2022-04-06 06:30:58 -0700 Committed r292461 (249312@main): <https://commits.webkit.org/249312@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456799. 1858802 5 webkit-bug-importer 2022-04-06 06:31:17 -0700 <rdar://problem/91350205> 456792 2022-04-06 01:52:03 -0700 2022-04-06 03:43:38 -0700 Patch bug-238858-20220406115201.patch text/plain 18817 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0Mzc1MDhhYWYzOGI1ZmU0 YTEzOTk4ZTlhNThhMmIzYjNmYmUxMzAuLmUxODEzMGI1ZDVjYWRkYzY0MTI1ZWYzMmI3NDY4NzY3 ZmI2ZDc3NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjItMDQtMDYgIEtpbW1vIEtp bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBhbmQgV2ViUlRD IGNvZGUgdXNlcyBUaHJlYWRNZXNzYWdlUmVjZWl2ZXJSZWZDb3VudGVkIHdpdGggV29ya1F1ZXVl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4ODU4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVkaWEg YW5kIFdlYlJUQyBjb2RlIHVzZXMgSVBDOjpDb25uZWN0aW9uOjpUaHJlYWRNZXNzYWdlUmVjZWl2 ZXJSZWZDb3VudGVkCisgICAgICAgIHRvIHN1Ym1pdCB3b3JrIHRvIGEgV29ya1F1ZXVlLiBGb3Ig dGhpcyB1c2UtY2FzZSwgSVBDOjpDb25uZWN0aW9uIGhhcworICAgICAgICBJUEM6OkNvbm5lY3Rp b246OldvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlciwgd2hpY2ggZG9lcyB0aGUgc2FtZS4KKworICAg ICAgICBUaGlzIGlzIHdvcmsgdG93YXJkcyBzaW1wbGlmeWluZyBJUEM6OkNvbm5lY3Rpb24gYnkg cmVtb3ZpbmcKKyAgICAgICAgVGhyZWFkTWVzc2FnZVJlY2VpdmVyUmVmQ291bnRlZC4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIHJlZmFjdG9yLgorCisgICAgICAgICogR1BVUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDQ29kZWNzUHJveHkuaDoKKyAgICAgICAgKiBHUFVQcm9jZXNzL3dlYnJ0Yy9M aWJXZWJSVENDb2RlY3NQcm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNz UHJveHk6OnN0b3BMaXN0ZW5pbmdGb3JJUEMpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVEND b2RlY3NQcm94eTo6aW5pdGlhbGl6ZSk6CisgICAgICAgICogR1BVUHJvY2Vzcy93ZWJydGMvUmVt b3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6OnN0YXJ0TGlzdGVuaW5nRm9y SVBDKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFu YWdlcjo6Y2xvc2UpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5 TGF5ZXJNYW5hZ2VyOjpjcmVhdGVMYXllcik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNhbXBs ZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6OnJlbGVhc2VMYXllcik6CisgICAgICAgICogR1BV UHJvY2Vzcy93ZWJydGMvUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlci5oOgor ICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuY3BwOgorICAg ICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3M6OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9u T25NYWluVGhyZWFkV2l0aExvY2spOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3M6 OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uQW5kRGlzcGF0Y2hUb1RocmVhZCk6CisgICAgICAg IChXZWJLaXQ6OkxpYldlYlJUQ0NvZGVjczo6Z3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRDbG9zZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5oOgorICAg ICAgICAqIFdlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpSZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlcjo6c3RvcExpc3Rlbmlu Z0ZvcklQQyk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpz ZXRDb25uZWN0aW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1JlbW90ZUNhcHR1cmVT YW1wbGVNYW5hZ2VyLmg6CisKIDIwMjItMDQtMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBOb3RpZmljYXRpb246Om1fcmVsYXRlZE5vdGlmaWNh dGlvbklkZW50aWZpZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDQ29kZWNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDQ29kZWNzUHJveHkuaAppbmRleCA2OWUxYTg2NGVlYzg4ZWRlNDg1ZTUzZDhk MmRhY2ZkMTM1MzU0NTMzLi41ZTI3MmE2YWM0ZjlmNjJjOGQwODJlMjRkYjZhN2JiN2I0ZDg4NWFm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0Nv ZGVjc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJS VENDb2RlY3NQcm94eS5oCkBAIC01Niw3ICs1Niw3IEBAIGNsYXNzIFJlbW90ZVZpZGVvRnJhbWVP YmplY3RIZWFwOwogc3RydWN0IFNoYXJlZFZpZGVvRnJhbWU7CiBjbGFzcyBTaGFyZWRWaWRlb0Zy YW1lUmVhZGVyOwogCi1jbGFzcyBMaWJXZWJSVENDb2RlY3NQcm94eSBmaW5hbCA6IHB1YmxpYyBJ UEM6OkNvbm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZlclJlZkNvdW50ZWQgeworY2xhc3Mg TGliV2ViUlRDQ29kZWNzUHJveHkgZmluYWwgOiBwdWJsaWMgSVBDOjpDb25uZWN0aW9uOjpXb3Jr UXVldWVNZXNzYWdlUmVjZWl2ZXIgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVi bGljOgogICAgIHN0YXRpYyBSZWY8TGliV2ViUlRDQ29kZWNzUHJveHk+IGNyZWF0ZShHUFVDb25u ZWN0aW9uVG9XZWJQcm9jZXNzJik7CkBAIC03MCwxMSArNzAsOSBAQCBwcml2YXRlOgogICAgIGF1 dG8gY3JlYXRlRGVjb2RlckNhbGxiYWNrKFJUQ0RlY29kZXJJZGVudGlmaWVyLCBib29sIHVzZVJl bW90ZUZyYW1lcyk7CiAgICAgV29ya1F1ZXVlJiB3b3JrUXVldWUoKSBjb25zdCB7IHJldHVybiBt X3F1ZXVlOyB9CiAKLSAgICAvLyBJUEM6OkNvbm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZl cgotICAgIHZvaWQgZGlzcGF0Y2hUb1RocmVhZChGdW5jdGlvbjx2b2lkKCk+JiYpIGZpbmFsOwot Ci0gICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICAvLyBJUEM6OkNvbm5lY3Rpb246Oldv cmtRdWV1ZU1lc3NhZ2VSZWNlaXZlciBvdmVycmlkZXMuCiAgICAgdm9pZCBkaWRSZWNlaXZlTWVz c2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKwogICAgIHZvaWQg Y3JlYXRlSDI2NERlY29kZXIoUlRDRGVjb2RlcklkZW50aWZpZXIsIGJvb2wgdXNlUmVtb3RlRnJh bWVzKTsKICAgICB2b2lkIGNyZWF0ZUgyNjVEZWNvZGVyKFJUQ0RlY29kZXJJZGVudGlmaWVyLCBi b29sIHVzZVJlbW90ZUZyYW1lcyk7CiAgICAgdm9pZCBjcmVhdGVWUDlEZWNvZGVyKFJUQ0RlY29k ZXJJZGVudGlmaWVyLCBib29sIHVzZVJlbW90ZUZyYW1lcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0NvZGVjc1Byb3h5Lm1tIGIvU291cmNl L1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3NQcm94eS5tbQppbmRleCAw ZjgyZDk0NTVhOTk1NGViMzBlYjZlM2FhMWZmMTBmM2E2NzkyMmY5Li4wZGQ5MjYxMGIwYjVmNDdi ZTdlZjVmMGNhM2M1NmNkMWJkNmU0YTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVBy b2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0NvZGVjc1Byb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv R1BVUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDQ29kZWNzUHJveHkubW0KQEAgLTY4LDkgKzY4LDkg QEAgTGliV2ViUlRDQ29kZWNzUHJveHk6On5MaWJXZWJSVENDb2RlY3NQcm94eSgpID0gZGVmYXVs dDsKIAogdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6c3RvcExpc3RlbmluZ0ZvcklQQyhSZWY8 TGliV2ViUlRDQ29kZWNzUHJveHk+JiYgcmVmRnJvbUNvbm5lY3Rpb24pCiB7Ci0gICAgbV9jb25u ZWN0aW9uLT5yZW1vdmVUaHJlYWRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkxpYldlYlJUQ0Nv ZGVjc1Byb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworICAgIG1fY29ubmVjdGlvbi0+cmVt b3ZlV29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpMaWJXZWJSVENDb2RlY3NQcm94 eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKIAotICAgIGRpc3BhdGNoVG9UaHJlYWQoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHJlZkZyb21Db25uZWN0aW9uKV0geworICAgIG1fcXVl dWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShyZWZGcm9tQ29ubmVj dGlvbildIHsKICAgICAgICAgYXNzZXJ0SXNDdXJyZW50KHdvcmtRdWV1ZSgpKTsKICAgICAgICAg YXV0byBkZWNvZGVycyA9IFdURk1vdmUobV9kZWNvZGVycyk7CiAgICAgICAgIGZvciAoYXV0byBk ZWNvZGVyIDogZGVjb2RlcnMudmFsdWVzKCkpCkBAIC04MywxMiArODMsNyBAQCB2b2lkIExpYldl YlJUQ0NvZGVjc1Byb3h5OjpzdG9wTGlzdGVuaW5nRm9ySVBDKFJlZjxMaWJXZWJSVENDb2RlY3NQ cm94eT4mJiByZWZGcgogCiB2b2lkIExpYldlYlJUQ0NvZGVjc1Byb3h5Ojppbml0aWFsaXplKCkK IHsKLSAgICBtX2Nvbm5lY3Rpb24tPmFkZFRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 TGliV2ViUlRDQ29kZWNzUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgdGhpcyk7Ci19Ci0K LXZvaWQgTGliV2ViUlRDQ29kZWNzUHJveHk6OmRpc3BhdGNoVG9UaHJlYWQoRnVuY3Rpb248dm9p ZCgpPiYmIGZ1bmN0aW9uKQotewotICAgIG1fcXVldWUtPmRpc3BhdGNoKFdURk1vdmUoZnVuY3Rp b24pKTsKKyAgICBtX2Nvbm5lY3Rpb24tPmFkZFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9xdWV1 ZSwgKnRoaXMpOwogfQogCiBhdXRvIExpYldlYlJUQ0NvZGVjc1Byb3h5OjpjcmVhdGVEZWNvZGVy Q2FsbGJhY2soUlRDRGVjb2RlcklkZW50aWZpZXIgaWRlbnRpZmllciwgYm9vbCB1c2VSZW1vdGVG cmFtZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL1JlbW90 ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL3dlYnJ0Yy9SZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyLmNwcApp bmRleCA3NmU3OTljMzVhZjJlZGQyMzY2ZDdjYWNkZDNlNWU3MTk3NWM1NmQ2Li4zYjI4YjNiNWM2 OTM2NjZiNTFlYTlmMmJkZTBkMDcxZWEzODk2ZWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0dQVVByb2Nlc3Mvd2VicnRjL1JlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvUmVtb3RlU2FtcGxlQnVm ZmVyRGlzcGxheUxheWVyTWFuYWdlci5jcHAKQEAgLTQ3LDI2ICs0NywyMSBAQCBSZW1vdGVTYW1w bGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyOjpSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5 ZXJNYW5hZ2VyKEdQVQogCiB2b2lkIFJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFn ZXI6OnN0YXJ0TGlzdGVuaW5nRm9ySVBDKCkKIHsKLSAgICBtX2Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MuY29ubmVjdGlvbigpLmFkZFRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3Rl U2FtcGxlQnVmZmVyRGlzcGxheUxheWVyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIHRoaXMpOwot ICAgIG1fY29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jb25uZWN0aW9uKCkuYWRkVGhyZWFkTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2Vy OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIHRoaXMpOworICAgIG1fY29ubmVjdGlvblRvV2ViUHJv Y2Vzcy5jb25uZWN0aW9uKCkuYWRkV29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpS ZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9x dWV1ZSwgKnRoaXMpOworICAgIG1fY29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jb25uZWN0aW9uKCku YWRkV29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVTYW1wbGVCdWZmZXJE aXNwbGF5TGF5ZXJNYW5hZ2VyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcXVldWUsICp0aGlz KTsKIH0KIAogUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcjo6flJlbW90ZVNh bXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXIoKSA9IGRlZmF1bHQ7CiAKIHZvaWQgUmVtb3Rl U2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcjo6Y2xvc2UoKQogewotICAgIG1fY29ubmVj dGlvblRvV2ViUHJvY2Vzcy5jb25uZWN0aW9uKCkucmVtb3ZlVGhyZWFkTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXI6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSk7Ci0gICAgbV9jb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNvbm5lY3Rpb24oKS5yZW1v dmVUaHJlYWRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZVNhbXBsZUJ1ZmZlckRpc3Bs YXlMYXllck1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7Ci0gICAgZGlzcGF0Y2hUb1Ro cmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZiB7ICp0aGlzIH1dIHsKKyAgICBtX2Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MuY29ubmVjdGlvbigpLnJlbW92ZVdvcmtRdWV1ZU1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6UmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyOjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCkpOworICAgIG1fY29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jb25uZWN0aW9uKCku cmVtb3ZlV29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVTYW1wbGVCdWZm ZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworICAgIG1fcXVl dWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfV0gewogICAg ICAgICBjYWxsT25NYWluUnVuTG9vcChbbGF5ZXJzID0gV1RGTW92ZShtX2xheWVycyldIHsgfSk7 CiAgICAgfSk7CiB9CiAKLXZvaWQgUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdl cjo6ZGlzcGF0Y2hUb1RocmVhZChGdW5jdGlvbjx2b2lkKCk+JiYgY2FsbGJhY2spCi17Ci0gICAg bV9xdWV1ZS0+ZGlzcGF0Y2goV1RGTW92ZShjYWxsYmFjaykpOwotfQotCiBib29sIFJlbW90ZVNh bXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6OmRpc3BhdGNoTWVzc2FnZShJUEM6OkNvbm5l Y3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBpZiAoIWRl Y29kZXIuZGVzdGluYXRpb25JRCgpKQpAQCAtODQsNyArNzksNyBAQCB2b2lkIFJlbW90ZVNhbXBs ZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6OmNyZWF0ZUxheWVyKFNhbXBsZUJ1ZmZlckRpc3Bs YXlMYXllcgogICAgICAgICBhdXRvIGxheWVyID0gUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxh eWVyOjpjcmVhdGUobV9jb25uZWN0aW9uVG9XZWJQcm9jZXNzLCBpZGVudGlmaWVyLCBtX2Nvbm5l Y3Rpb24uY29weVJlZigpKTsKICAgICAgICAgYXV0byYgbGF5ZXJSZWZlcmVuY2UgPSAqbGF5ZXI7 CiAgICAgICAgIGxheWVyUmVmZXJlbmNlLmluaXRpYWxpemUoaGlkZVJvb3RMYXllciwgc2l6ZSwg W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWYgeyAqdGhpcyB9LCBjYWxsYmFjayA9IFdURk1vdmUo Y2FsbGJhY2spLCBpZGVudGlmaWVyLCBsYXllciA9IFdURk1vdmUobGF5ZXIpXShhdXRvIGxheWVy SWQpIG11dGFibGUgewotICAgICAgICAgICAgZGlzcGF0Y2hUb1RocmVhZChbdGhpcywgcHJvdGVj dGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxs YmFjayksIGlkZW50aWZpZXIsIGxheWVyID0gV1RGTW92ZShsYXllciksIGxheWVySWQgPSBXVEZN b3ZlKGxheWVySWQpXSgpIG11dGFibGUgeworICAgICAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2go W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBjYWxsYmFjayA9 IFdURk1vdmUoY2FsbGJhY2spLCBpZGVudGlmaWVyLCBsYXllciA9IFdURk1vdmUobGF5ZXIpLCBs YXllcklkID0gV1RGTW92ZShsYXllcklkKV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBB U1NFUlQoIW1fbGF5ZXJzLmNvbnRhaW5zKGlkZW50aWZpZXIpKTsKICAgICAgICAgICAgICAgICBt X2xheWVycy5hZGQoaWRlbnRpZmllciwgV1RGTW92ZShsYXllcikpOwogICAgICAgICAgICAgICAg IGNhbGxiYWNrKFdURk1vdmUobGF5ZXJJZCkpOwpAQCAtOTYsNyArOTEsNyBAQCB2b2lkIFJlbW90 ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6OmNyZWF0ZUxheWVyKFNhbXBsZUJ1ZmZl ckRpc3BsYXlMYXllcgogdm9pZCBSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2Vy OjpyZWxlYXNlTGF5ZXIoU2FtcGxlQnVmZmVyRGlzcGxheUxheWVySWRlbnRpZmllciBpZGVudGlm aWVyKQogewogICAgIGNhbGxPbk1haW5SdW5Mb29wKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gUmVm IHsgKnRoaXMgfSwgaWRlbnRpZmllcl0oKSBtdXRhYmxlIHsKLSAgICAgICAgZGlzcGF0Y2hUb1Ro cmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGlkZW50 aWZpZXJdIHsKKyAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBpZGVudGlmaWVyXSB7CiAgICAgICAgICAgICBBU1NF UlQobV9sYXllcnMuY29udGFpbnMoaWRlbnRpZmllcikpOwogICAgICAgICAgICAgY2FsbE9uTWFp blJ1bkxvb3AoW2xheWVyID0gbV9sYXllcnMudGFrZShpZGVudGlmaWVyKV0geyB9KTsKICAgICAg ICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL1JlbW90 ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy93ZWJydGMvUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlci5oCmluZGV4 IDhlNjYyNjdkYzUwMjdmNjIyNmEzY2UzNzZlMjdkZmY1MDQxMzVlNzkuLjM1MmQxMWVjZjQ0Njgy MzZiMjNmOGU0MjE4MmJmZGYxNTI4M2JjODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BV UHJvY2Vzcy93ZWJydGMvUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlci5oCisr KyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvUmVtb3RlU2FtcGxlQnVmZmVyRGlz cGxheUxheWVyTWFuYWdlci5oCkBAIC00Niw3ICs0Niw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewog Y2xhc3MgR1BVQ29ubmVjdGlvblRvV2ViUHJvY2VzczsKIGNsYXNzIFJlbW90ZVNhbXBsZUJ1ZmZl ckRpc3BsYXlMYXllcjsKIAotY2xhc3MgUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFu YWdlciBmaW5hbCA6IHB1YmxpYyBJUEM6OkNvbm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZl clJlZkNvdW50ZWQgeworY2xhc3MgUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdl ciBmaW5hbCA6IHB1YmxpYyBJUEM6OkNvbm5lY3Rpb246OldvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZl ciB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJl ZjxSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyPiBjcmVhdGUoR1BVQ29ubmVj dGlvblRvV2ViUHJvY2VzcyYgY29ubmVjdGlvbikKQEAgLTYxLDE1ICs2MSwxNCBAQCBwdWJsaWM6 CiAKICAgICBib29sIGFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNzdXJlKCkgY29uc3Q7CiAKKyAg ICAvLyBJUEM6OkNvbm5lY3Rpb246OldvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlciBvdmVycmlkZXMu CisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29k ZXImKSBmaW5hbDsKKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBSZW1vdGVTYW1wbGVCdWZmZXJE aXNwbGF5TGF5ZXJNYW5hZ2VyKEdQVUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmKTsKICAgICB2b2lk IHN0YXJ0TGlzdGVuaW5nRm9ySVBDKCk7CiAKLSAgICAvLyBJUEM6OkNvbm5lY3Rpb246OlRocmVh ZE1lc3NhZ2VSZWNlaXZlcgotICAgIHZvaWQgZGlzcGF0Y2hUb1RocmVhZChGdW5jdGlvbjx2b2lk KCk+JiYpIGZpbmFsOwogCi0gICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKLSAgICB2b2lkIGRp ZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOwog ICAgIGJvb2wgZGlzcGF0Y2hNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYp OwogCiAgICAgdXNpbmcgTGF5ZXJDcmVhdGlvbkNhbGxiYWNrID0gQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChzdGQ6Om9wdGlvbmFsPExheWVySG9zdGluZ0NvbnRleHRJRD4pPiYmOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmNw cCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5j cHAKaW5kZXggZjE0MTliNzQ5NzhlZTdlNDk3Yjg5NmQyMDdiMzc0ODRiOGRiMTdlOS4uMTVhZDJl MmU0NWIyMGYxMGZhMzIwYTg4M2M0OGQ5YWZiNmVlMzk3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuY3BwCkBAIC0x ODYsNyArMTg2LDcgQEAgdm9pZCBMaWJXZWJSVENDb2RlY3M6OmVuc3VyZUdQVVByb2Nlc3NDb25u ZWN0aW9uT25NYWluVGhyZWFkV2l0aExvY2soKQogICAgIGdwdUNvbm5lY3Rpb24uYWRkQ2xpZW50 KCp0aGlzKTsKICAgICBtX2Nvbm5lY3Rpb24gPSAmZ3B1Q29ubmVjdGlvbi5jb25uZWN0aW9uKCk7 CiAgICAgbV92aWRlb0ZyYW1lT2JqZWN0SGVhcFByb3h5ID0gJmdwdUNvbm5lY3Rpb24udmlkZW9G cmFtZU9iamVjdEhlYXBQcm94eSgpOwotICAgIG1fY29ubmVjdGlvbi0+YWRkVGhyZWFkTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpMaWJXZWJSVENDb2RlY3M6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgdGhpcyk7CisgICAgbV9jb25uZWN0aW9uLT5hZGRXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OkxpYldlYlJUQ0NvZGVjczo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3F1ZXVl LCAqdGhpcyk7CiAKICAgICBpZiAobV9sb2dnaW5nTGV2ZWwpCiAgICAgICAgIG1fY29ubmVjdGlv bi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6OlNldFJUQ0xvZ2dpbmdMZXZl bCB7ICptX2xvZ2dpbmdMZXZlbCB9LCAwKTsKQEAgLTIwMSw3ICsyMDEsNyBAQCB2b2lkIExpYldl YlJUQ0NvZGVjczo6ZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb25BbmREaXNwYXRjaFRvVGhyZWFk KEZ1bmN0aW9uPHZvaQogCiAgICAgLy8gRmFzdCBwYXRoIHdoZW4gd2UgYWxyZWFkeSBoYXZlIGEg Y29ubmVjdGlvbi4KICAgICBpZiAobV9jb25uZWN0aW9uKSB7Ci0gICAgICAgIGRpc3BhdGNoVG9U aHJlYWQoV1RGTW92ZSh0YXNrKSk7CisgICAgICAgIG1fcXVldWUtPmRpc3BhdGNoKFdURk1vdmUo dGFzaykpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yMTQsNyArMjE0LDcgQEAgdm9p ZCBMaWJXZWJSVENDb2RlY3M6OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uQW5kRGlzcGF0Y2hU b1RocmVhZChGdW5jdGlvbjx2b2kKICAgICAgICAgTG9ja2VyIGxvY2tlciB7IG1fY29ubmVjdGlv bkxvY2sgfTsKICAgICAgICAgZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb25Pbk1haW5UaHJlYWRX aXRoTG9jaygpOwogICAgICAgICBmb3IgKGF1dG8mIHRhc2sgOiBzdGQ6OmV4Y2hhbmdlKG1fdGFz a3NUb0Rpc3BhdGNoQWZ0ZXJFc3RhYmxpc2hpbmdDb25uZWN0aW9uLCB7IH0pKQotICAgICAgICAg ICAgZGlzcGF0Y2hUb1RocmVhZChXVEZNb3ZlKHRhc2spKTsKKyAgICAgICAgICAgIG1fcXVldWUt PmRpc3BhdGNoKFdURk1vdmUodGFzaykpOwogICAgIH0pOwogfQogCkBAIC01NjgsMjIgKzU2OCwx NyBAQCBDVlBpeGVsQnVmZmVyUG9vbFJlZiBMaWJXZWJSVENDb2RlY3M6OnBpeGVsQnVmZmVyUG9v bChzaXplX3Qgd2lkdGgsIHNpemVfdCBoZWlnaAogICAgIHJldHVybiBtX3BpeGVsQnVmZmVyUG9v bC5nZXQoKTsKIH0KIAotdm9pZCBMaWJXZWJSVENDb2RlY3M6OmRpc3BhdGNoVG9UaHJlYWQoRnVu Y3Rpb248dm9pZCgpPiYmIGNhbGxiYWNrKQotewotICAgIG1fcXVldWUtPmRpc3BhdGNoKFdURk1v dmUoY2FsbGJhY2spKTsKLX0KLQogdm9pZCBMaWJXZWJSVENDb2RlY3M6OmdwdVByb2Nlc3NDb25u ZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24mKQogewogICAgIEFTU0VSVChpc01h aW5SdW5Mb29wKCkpOwogCiAgICAgTG9ja2VyIGxvY2tlciB7IG1fY29ubmVjdGlvbkxvY2sgfTsK LSAgICBzdGQ6OmV4Y2hhbmdlKG1fY29ubmVjdGlvbiwgbnVsbHB0ciktPnJlbW92ZVRocmVhZE1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzOjptZXNzYWdlUmVjZWl2ZXJO YW1lKCkpOworICAgIHN0ZDo6ZXhjaGFuZ2UobV9jb25uZWN0aW9uLCBudWxscHRyKS0+cmVtb3Zl V29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpMaWJXZWJSVENDb2RlY3M6Om1lc3Nh Z2VSZWNlaXZlck5hbWUoKSk7CiAgICAgaWYgKCFtX25lZWRzR1BVUHJvY2Vzc0Nvbm5lY3Rpb24p CiAgICAgICAgIHJldHVybjsKIAogICAgIGVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uT25NYWlu VGhyZWFkV2l0aExvY2soKTsKLSAgICBkaXNwYXRjaFRvVGhyZWFkKFt0aGlzLCBjb25uZWN0aW9u ID0gbV9jb25uZWN0aW9uXSgpIHsKKyAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgY29ubmVj dGlvbiA9IG1fY29ubmVjdGlvbl0oKSB7CiAgICAgICAgIGFzc2VydElzQ3VycmVudCh3b3JrUXVl dWUoKSk7CiAgICAgICAgIHsKICAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBtX2Nvbm5lY3Rp b25Mb2NrIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL3dlYnJ0 Yy9MaWJXZWJSVENDb2RlY3MuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRj L0xpYldlYlJUQ0NvZGVjcy5oCmluZGV4IDAyZGNjYWM4NDAwMTAwMzgxZWY0Y2NjZGJkZDdkMjQ2 MGU5NjU0M2MuLjBmOTA2Yzg0OTMzZThmNmYwZjc4MzI5ODE2ZjU2ZjI1ZWEwNDljY2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVj cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0Nv ZGVjcy5oCkBAIC02MCw3ICs2MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBSZW1v dGVWaWRlb0ZyYW1lT2JqZWN0SGVhcFByb3h5OwogCi1jbGFzcyBMaWJXZWJSVENDb2RlY3MgOiBw dWJsaWMgSVBDOjpDb25uZWN0aW9uOjpUaHJlYWRNZXNzYWdlUmVjZWl2ZXJSZWZDb3VudGVkLCBw dWJsaWMgR1BVUHJvY2Vzc0Nvbm5lY3Rpb246OkNsaWVudCB7CitjbGFzcyBMaWJXZWJSVENDb2Rl Y3MgOiBwdWJsaWMgSVBDOjpDb25uZWN0aW9uOjpXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIsIHB1 YmxpYyBHUFVQcm9jZXNzQ29ubmVjdGlvbjo6Q2xpZW50IHsKICAgICBXVEZfTUFLRV9GQVNUX0FM TE9DQVRFRDsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPExpYldlYlJUQ0NvZGVjcz4gY3JlYXRl KCk7CkBAIC0xMzUsOSArMTM1LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXBsZXRlZEVuY29k aW5nKFJUQ0VuY29kZXJJZGVudGlmaWVyLCBJUEM6OkRhdGFSZWZlcmVuY2UmJiwgY29uc3Qgd2Vi cnRjOjpXZWJLaXRFbmNvZGVkRnJhbWVJbmZvJik7CiAgICAgUmV0YWluUHRyPENWUGl4ZWxCdWZm ZXJSZWY+IGNvbnZlcnRUb0JHUkEoQ1ZQaXhlbEJ1ZmZlclJlZik7CiAKLSAgICAvLyBJUEM6OkNv bm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZlcgotICAgIHZvaWQgZGlzcGF0Y2hUb1RocmVh ZChGdW5jdGlvbjx2b2lkKCk+JiYpIGZpbmFsOwotCiAgICAgLy8gR1BVUHJvY2Vzc0Nvbm5lY3Rp b246OkNsaWVudAogICAgIHZvaWQgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRDbG9zZShHUFVQcm9j ZXNzQ29ubmVjdGlvbiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL2NvY29hL1JlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyLmNwcAppbmRleCBmZmJmYTMx ZmVhMGQyMThjOGNiNTUwNzQ1OTQxMjQ3NWQyNjhmNzE0Li5mYTlhYWU1NGI4NTQyODJlOGJiYmM2 MGY0M2M3OTI3ZmM4MjQyMDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlci5jcHAKQEAgLTU0LDcg KzU0LDcgQEAgUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXI6On5SZW1vdGVDYXB0dXJlU2FtcGxl TWFuYWdlcigpCiB2b2lkIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpzdG9wTGlzdGVuaW5n Rm9ySVBDKCkKIHsKICAgICBpZiAobV9pc1JlZ2lzdGVyZWRUb1BhcmVudFByb2Nlc3NDb25uZWN0 aW9uKQotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVj dGlvbigpLT5yZW1vdmVUaHJlYWRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZUNhcHR1 cmVTYW1wbGVNYW5hZ2VyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworICAgICAgICBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5yZW1vdmVXb3JrUXVl dWVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOwogICAgIHNldENvbm5lY3Rpb24obnVsbHB0cik7CiB9CiAK QEAgLTY3LDE3ICs2NywxNyBAQCB2b2lkIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpzZXRD b25uZWN0aW9uKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbikKICAgICBpZiAoY29ubmVjdGlv biA9PSBwYXJlbnRDb25uZWN0aW9uKSB7CiAgICAgICAgIGlmICghbV9pc1JlZ2lzdGVyZWRUb1Bh cmVudFByb2Nlc3NDb25uZWN0aW9uKSB7CiAgICAgICAgICAgICBtX2lzUmVnaXN0ZXJlZFRvUGFy ZW50UHJvY2Vzc0Nvbm5lY3Rpb24gPSB0cnVlOwotICAgICAgICAgICAgcGFyZW50Q29ubmVjdGlv bi0+YWRkVGhyZWFkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVDYXB0dXJlU2FtcGxl TWFuYWdlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCB0aGlzKTsKKyAgICAgICAgICAgIHBhcmVu dENvbm5lY3Rpb24tPmFkZFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3Rl Q2FwdHVyZVNhbXBsZU1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9xdWV1ZSwgKnRo aXMpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKG1fY29ubmVj dGlvbikKLSAgICAgICAgbV9jb25uZWN0aW9uLT5yZW1vdmVUaHJlYWRNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjptZXNzYWdlUmVjZWl2ZXJOYW1l KCkpOworICAgICAgICBtX2Nvbm5lY3Rpb24tPnJlbW92ZVdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZl cihNZXNzYWdlczo6UmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5h bWUoKSk7CiAKICAgICBtX2Nvbm5lY3Rpb24gPSBXVEZNb3ZlKGNvbm5lY3Rpb24pOwogCiAgICAg aWYgKG1fY29ubmVjdGlvbikKLSAgICAgICAgbV9jb25uZWN0aW9uLT5hZGRUaHJlYWRNZXNzYWdl UmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIHRoaXMpOworICAgICAgICBtX2Nvbm5lY3Rpb24tPmFkZFdvcmtRdWV1ZU1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXI6Om1lc3Nh Z2VSZWNlaXZlck5hbWUoKSwgbV9xdWV1ZSwgKnRoaXMpOwogfQogCiB2b2lkIFJlbW90ZUNhcHR1 cmVTYW1wbGVNYW5hZ2VyOjphZGRTb3VyY2UoUmVmPFJlbW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2U+ JiYgc291cmNlKQpAQCAtMTI4LDExICsxMjgsNiBAQCB2b2lkIFJlbW90ZUNhcHR1cmVTYW1wbGVN YW5hZ2VyOjpzZXRWaWRlb0ZyYW1lT2JqZWN0SGVhcFByb3h5KFJlbW90ZVZpZGVvRnJhbWVPYgog ICAgIG1fdmlkZW9GcmFtZU9iamVjdEhlYXBQcm94eSA9IHByb3h5OwogfQogCi12b2lkIFJlbW90 ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpkaXNwYXRjaFRvVGhyZWFkKEZ1bmN0aW9uPHZvaWQoKT4m JiBjYWxsYmFjaykKLXsKLSAgICBtX3F1ZXVlLT5kaXNwYXRjaChXVEZNb3ZlKGNhbGxiYWNrKSk7 Ci19Ci0KIHZvaWQgUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXI6OmF1ZGlvU3RvcmFnZUNoYW5n ZWQoV2ViQ29yZTo6UmVhbHRpbWVNZWRpYVNvdXJjZUlkZW50aWZpZXIgaWRlbnRpZmllciwgY29u c3QgU2hhcmVkTWVtb3J5OjpJUENIYW5kbGUmIGlwY0hhbmRsZSwgY29uc3QgV2ViQ29yZTo6Q0FB dWRpb1N0cmVhbURlc2NyaXB0aW9uJiBkZXNjcmlwdGlvbiwgdWludDY0X3QgbnVtYmVyT2ZGcmFt ZXMsIElQQzo6U2VtYXBob3JlJiYgc2VtYXBob3JlLCBjb25zdCBNZWRpYVRpbWUmIG1lZGlhVGlt ZSwgc2l6ZV90IGZyYW1lQ2h1bmtTaXplKQogewogICAgIEFTU0VSVCghV1RGOjppc01haW5SdW5M b29wKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1JlbW90 ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev UmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXIuaAppbmRleCA1ZTNmODM0MDc2OGJiZThhOWNiODlj NDgyN2EzMmE5MTdlOTM4N2QwLi45OGZlYWIyYjI5NzY2NTQwMzI4ZGI4YWMxZDRlNGE4NmU5YzE4 Nzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2Fw dHVyZVNhbXBsZU1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev UmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXIuaApAQCAtNDksNyArNDksNyBAQCBjbGFzcyBJbWFn ZVRyYW5zZmVyU2Vzc2lvblZUOwogbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBSZW1vdGVWaWRl b0ZyYW1lT2JqZWN0SGVhcFByb3h5OwogCi1jbGFzcyBSZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdl ciA6IHB1YmxpYyBJUEM6OkNvbm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZlclJlZkNvdW50 ZWQgeworY2xhc3MgUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXIgOiBwdWJsaWMgSVBDOjpDb25u ZWN0aW9uOjpXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIgewogICAgIFdURl9NQUtFX0ZBU1RfQUxM T0NBVEVEOwogcHVibGljOgogICAgIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyKCk7CkBAIC02 MywxMiArNjMsMTAgQEAgcHVibGljOgogICAgIHZvaWQgZGlkVXBkYXRlU291cmNlQ29ubmVjdGlv bihJUEM6OkNvbm5lY3Rpb24qKTsKICAgICB2b2lkIHNldFZpZGVvRnJhbWVPYmplY3RIZWFwUHJv eHkoUmVtb3RlVmlkZW9GcmFtZU9iamVjdEhlYXBQcm94eSopOwogCisgICAgLy8gSVBDOjpDb25u ZWN0aW9uOjpXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIgb3ZlcnJpZGVzLgogICAgIHZvaWQgZGlk UmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJik7CiAKIHByaXZh dGU6Ci0gICAgLy8gSVBDOjpDb25uZWN0aW9uOjpUaHJlYWRNZXNzYWdlUmVjZWl2ZXIKLSAgICB2 b2lkIGRpc3BhdGNoVG9UaHJlYWQoRnVuY3Rpb248dm9pZCgpPiYmKSBmaW5hbDsKLQogICAgIC8v IE1lc3NhZ2VzCiAgICAgdm9pZCBhdWRpb1N0b3JhZ2VDaGFuZ2VkKFdlYkNvcmU6OlJlYWx0aW1l TWVkaWFTb3VyY2VJZGVudGlmaWVyLCBjb25zdCBTaGFyZWRNZW1vcnk6OklQQ0hhbmRsZSYsIGNv bnN0IFdlYkNvcmU6OkNBQXVkaW9TdHJlYW1EZXNjcmlwdGlvbiYsIHVpbnQ2NF90IG51bWJlck9m RnJhbWVzLCBJUEM6OlNlbWFwaG9yZSYmLCBjb25zdCBNZWRpYVRpbWUmLCBzaXplX3QgZnJhbWVT YW1wbGVTaXplKTsKICAgICB2b2lkIGF1ZGlvU2FtcGxlc0F2YWlsYWJsZShXZWJDb3JlOjpSZWFs dGltZU1lZGlhU291cmNlSWRlbnRpZmllciwgTWVkaWFUaW1lLCB1aW50NjRfdCBudW1iZXJPZkZy YW1lcyk7Cg== 456799 2022-04-06 03:43:42 -0700 2022-04-06 06:30:58 -0700 For landing bug-238858-20220406134341.patch text/plain 18685 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0Mzc1MDhhYWYzOGI1ZmU0 YTEzOTk4ZTlhNThhMmIzYjNmYmUxMzAuLjJhYTFhMWYxMTg4NGExMjE5YWUzNGE1MzI3MmViNjlj NThiZTQ1MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjItMDQtMDYgIEtpbW1vIEtp bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBhbmQgV2ViUlRD IGNvZGUgdXNlcyBUaHJlYWRNZXNzYWdlUmVjZWl2ZXJSZWZDb3VudGVkIHdpdGggV29ya1F1ZXVl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4ODU4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBNZWRpYSBh bmQgV2ViUlRDIGNvZGUgdXNlcyBJUEM6OkNvbm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZl clJlZkNvdW50ZWQKKyAgICAgICAgdG8gc3VibWl0IHdvcmsgdG8gYSBXb3JrUXVldWUuIEZvciB0 aGlzIHVzZS1jYXNlLCBJUEM6OkNvbm5lY3Rpb24gaGFzCisgICAgICAgIElQQzo6Q29ubmVjdGlv bjo6V29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyLCB3aGljaCBkb2VzIHRoZSBzYW1lLgorCisgICAg ICAgIFRoaXMgaXMgd29yayB0b3dhcmRzIHNpbXBsaWZ5aW5nIElQQzo6Q29ubmVjdGlvbiBieSBy ZW1vdmluZworICAgICAgICBUaHJlYWRNZXNzYWdlUmVjZWl2ZXJSZWZDb3VudGVkLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cywgcmVmYWN0b3IuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL3dlYnJ0 Yy9MaWJXZWJSVENDb2RlY3NQcm94eS5oOgorICAgICAgICAqIEdQVVByb2Nlc3Mvd2VicnRjL0xp YldlYlJUQ0NvZGVjc1Byb3h5Lm1tOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQ cm94eTo6c3RvcExpc3RlbmluZ0ZvcklQQyk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ0Nv ZGVjc1Byb3h5Ojppbml0aWFsaXplKToKKyAgICAgICAgKiBHUFVQcm9jZXNzL3dlYnJ0Yy9SZW1v dGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcjo6c3RhcnRMaXN0ZW5pbmdGb3JJ UEMpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5h Z2VyOjpjbG9zZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlM YXllck1hbmFnZXI6OmNyZWF0ZUxheWVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlU2FtcGxl QnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcjo6cmVsZWFzZUxheWVyKToKKyAgICAgICAgKiBHUFVQ cm9jZXNzL3dlYnJ0Yy9SZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5jcHA6CisgICAg ICAgIChXZWJLaXQ6OkxpYldlYlJUQ0NvZGVjczo6ZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb25P bk1haW5UaHJlYWRXaXRoTG9jayk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ0NvZGVjczo6 ZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb25BbmREaXNwYXRjaFRvVGhyZWFkKToKKyAgICAgICAg KFdlYktpdDo6TGliV2ViUlRDQ29kZWNzOjpncHVQcm9jZXNzQ29ubmVjdGlvbkRpZENsb3NlKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmg6CisgICAg ICAgICogV2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlci5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpzdG9wTGlzdGVuaW5n Rm9ySVBDKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXI6OnNl dENvbm5lY3Rpb24pOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2FwdHVyZVNh bXBsZU1hbmFnZXIuaDoKKwogMjAyMi0wNC0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIE5vdGlmaWNhdGlvbjo6bV9yZWxhdGVkTm90aWZpY2F0 aW9uSWRlbnRpZmllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0 Yy9MaWJXZWJSVENDb2RlY3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0 Yy9MaWJXZWJSVENDb2RlY3NQcm94eS5oCmluZGV4IDY5ZTFhODY0ZWVjODhlZGU0ODVlNTNkOGQy ZGFjZmQxMzUzNTQ1MzMuLjVlMjcyYTZhYzRmOWY2MmM4ZDA4MmUyNGRiNmE3YmI3YjRkODg1YWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDQ29k ZWNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJU Q0NvZGVjc1Byb3h5LmgKQEAgLTU2LDcgKzU2LDcgQEAgY2xhc3MgUmVtb3RlVmlkZW9GcmFtZU9i amVjdEhlYXA7CiBzdHJ1Y3QgU2hhcmVkVmlkZW9GcmFtZTsKIGNsYXNzIFNoYXJlZFZpZGVvRnJh bWVSZWFkZXI7CiAKLWNsYXNzIExpYldlYlJUQ0NvZGVjc1Byb3h5IGZpbmFsIDogcHVibGljIElQ Qzo6Q29ubmVjdGlvbjo6VGhyZWFkTWVzc2FnZVJlY2VpdmVyUmVmQ291bnRlZCB7CitjbGFzcyBM aWJXZWJSVENDb2RlY3NQcm94eSBmaW5hbCA6IHB1YmxpYyBJUEM6OkNvbm5lY3Rpb246OldvcmtR dWV1ZU1lc3NhZ2VSZWNlaXZlciB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJs aWM6CiAgICAgc3RhdGljIFJlZjxMaWJXZWJSVENDb2RlY3NQcm94eT4gY3JlYXRlKEdQVUNvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MmKTsKQEAgLTcwLDExICs3MCw5IEBAIHByaXZhdGU6CiAgICAgYXV0 byBjcmVhdGVEZWNvZGVyQ2FsbGJhY2soUlRDRGVjb2RlcklkZW50aWZpZXIsIGJvb2wgdXNlUmVt b3RlRnJhbWVzKTsKICAgICBXb3JrUXVldWUmIHdvcmtRdWV1ZSgpIGNvbnN0IHsgcmV0dXJuIG1f cXVldWU7IH0KIAotICAgIC8vIElQQzo6Q29ubmVjdGlvbjo6VGhyZWFkTWVzc2FnZVJlY2VpdmVy Ci0gICAgdm9pZCBkaXNwYXRjaFRvVGhyZWFkKEZ1bmN0aW9uPHZvaWQoKT4mJikgZmluYWw7Ci0K LSAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIC8vIElQQzo6Q29ubmVjdGlvbjo6V29y a1F1ZXVlTWVzc2FnZVJlY2VpdmVyIG92ZXJyaWRlcy4KICAgICB2b2lkIGRpZFJlY2VpdmVNZXNz YWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOworCiAgICAgdm9pZCBj cmVhdGVIMjY0RGVjb2RlcihSVENEZWNvZGVySWRlbnRpZmllciwgYm9vbCB1c2VSZW1vdGVGcmFt ZXMpOwogICAgIHZvaWQgY3JlYXRlSDI2NURlY29kZXIoUlRDRGVjb2RlcklkZW50aWZpZXIsIGJv b2wgdXNlUmVtb3RlRnJhbWVzKTsKICAgICB2b2lkIGNyZWF0ZVZQOURlY29kZXIoUlRDRGVjb2Rl cklkZW50aWZpZXIsIGJvb2wgdXNlUmVtb3RlRnJhbWVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDQ29kZWNzUHJveHkubW0gYi9Tb3VyY2Uv V2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0NvZGVjc1Byb3h5Lm1tCmluZGV4IDBm ODJkOTQ1NWE5OTU0ZWIzMGViNmUzYWExZmYxMGYzYTY3OTIyZjkuLjBkZDkyNjEwYjBiNWY0N2Jl N2VmNWYwY2EzYzU2Y2QxYmQ2ZTRhNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy93ZWJydGMvTGliV2ViUlRDQ29kZWNzUHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdC9H UFVQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3NQcm94eS5tbQpAQCAtNjgsOSArNjgsOSBA QCBMaWJXZWJSVENDb2RlY3NQcm94eTo6fkxpYldlYlJUQ0NvZGVjc1Byb3h5KCkgPSBkZWZhdWx0 OwogCiB2b2lkIExpYldlYlJUQ0NvZGVjc1Byb3h5OjpzdG9wTGlzdGVuaW5nRm9ySVBDKFJlZjxM aWJXZWJSVENDb2RlY3NQcm94eT4mJiByZWZGcm9tQ29ubmVjdGlvbikKIHsKLSAgICBtX2Nvbm5l Y3Rpb24tPnJlbW92ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6TGliV2ViUlRDQ29k ZWNzUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CisgICAgbV9jb25uZWN0aW9uLT5yZW1v dmVXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkxpYldlYlJUQ0NvZGVjc1Byb3h5 OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOwogCi0gICAgZGlzcGF0Y2hUb1RocmVhZChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocmVmRnJvbUNvbm5lY3Rpb24pXSB7CisgICAgbV9xdWV1 ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHJlZkZyb21Db25uZWN0 aW9uKV0gewogICAgICAgICBhc3NlcnRJc0N1cnJlbnQod29ya1F1ZXVlKCkpOwogICAgICAgICBh dXRvIGRlY29kZXJzID0gV1RGTW92ZShtX2RlY29kZXJzKTsKICAgICAgICAgZm9yIChhdXRvIGRl Y29kZXIgOiBkZWNvZGVycy52YWx1ZXMoKSkKQEAgLTgzLDEyICs4Myw3IEBAIHZvaWQgTGliV2Vi UlRDQ29kZWNzUHJveHk6OnN0b3BMaXN0ZW5pbmdGb3JJUEMoUmVmPExpYldlYlJUQ0NvZGVjc1By b3h5PiYmIHJlZkZyCiAKIHZvaWQgTGliV2ViUlRDQ29kZWNzUHJveHk6OmluaXRpYWxpemUoKQog ewotICAgIG1fY29ubmVjdGlvbi0+YWRkVGhyZWFkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpM aWJXZWJSVENDb2RlY3NQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCB0aGlzKTsKLX0KLQot dm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6ZGlzcGF0Y2hUb1RocmVhZChGdW5jdGlvbjx2b2lk KCk+JiYgZnVuY3Rpb24pCi17Ci0gICAgbV9xdWV1ZS0+ZGlzcGF0Y2goV1RGTW92ZShmdW5jdGlv bikpOworICAgIG1fY29ubmVjdGlvbi0+YWRkV29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3Nh Z2VzOjpMaWJXZWJSVENDb2RlY3NQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3F1ZXVl LCAqdGhpcyk7CiB9CiAKIGF1dG8gTGliV2ViUlRDQ29kZWNzUHJveHk6OmNyZWF0ZURlY29kZXJD YWxsYmFjayhSVENEZWNvZGVySWRlbnRpZmllciBpZGVudGlmaWVyLCBib29sIHVzZVJlbW90ZUZy YW1lcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvUmVtb3Rl U2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVBy b2Nlc3Mvd2VicnRjL1JlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXIuY3BwCmlu ZGV4IDc2ZTc5OWMzNWFmMmVkZDIzNjZkN2NhY2RkM2U1ZTcxOTc1YzU2ZDYuLjNiMjhiM2I1YzY5 MzY2NmI1MWVhOWYyYmRlMGQwNzFlYTM4OTZlZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv R1BVUHJvY2Vzcy93ZWJydGMvUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlci5j cHAKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9SZW1vdGVTYW1wbGVCdWZm ZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyLmNwcApAQCAtNDcsMjYgKzQ3LDIxIEBAIFJlbW90ZVNhbXBs ZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6OlJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXll ck1hbmFnZXIoR1BVCiAKIHZvaWQgUmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdl cjo6c3RhcnRMaXN0ZW5pbmdGb3JJUEMoKQogewotICAgIG1fY29ubmVjdGlvblRvV2ViUHJvY2Vz cy5jb25uZWN0aW9uKCkuYWRkVGhyZWFkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVT YW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgdGhpcyk7Ci0g ICAgbV9jb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNvbm5lY3Rpb24oKS5hZGRUaHJlYWRNZXNzYWdl UmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6 Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgdGhpcyk7CisgICAgbV9jb25uZWN0aW9uVG9XZWJQcm9j ZXNzLmNvbm5lY3Rpb24oKS5hZGRXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJl bW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3F1 ZXVlLCAqdGhpcyk7CisgICAgbV9jb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNvbm5lY3Rpb24oKS5h ZGRXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZVNhbXBsZUJ1ZmZlckRp c3BsYXlMYXllck1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9xdWV1ZSwgKnRoaXMp OwogfQogCiBSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyOjp+UmVtb3RlU2Ft cGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcigpID0gZGVmYXVsdDsKIAogdm9pZCBSZW1vdGVT YW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyOjpjbG9zZSgpCiB7Ci0gICAgbV9jb25uZWN0 aW9uVG9XZWJQcm9jZXNzLmNvbm5lY3Rpb24oKS5yZW1vdmVUaHJlYWRNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OlJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllcjo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpKTsKLSAgICBtX2Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY29ubmVjdGlvbigpLnJlbW92 ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlU2FtcGxlQnVmZmVyRGlzcGxh eUxheWVyTWFuYWdlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKLSAgICBkaXNwYXRjaFRvVGhy ZWFkKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfV0geworICAgIG1fY29ubmVj dGlvblRvV2ViUHJvY2Vzcy5jb25uZWN0aW9uKCkucmVtb3ZlV29ya1F1ZXVlTWVzc2FnZVJlY2Vp dmVyKE1lc3NhZ2VzOjpSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXI6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSk7CisgICAgbV9jb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNvbm5lY3Rpb24oKS5y ZW1vdmVXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZVNhbXBsZUJ1ZmZl ckRpc3BsYXlMYXllck1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CisgICAgbV9xdWV1 ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWYgeyAqdGhpcyB9XSB7CiAgICAg ICAgIGNhbGxPbk1haW5SdW5Mb29wKFtsYXllcnMgPSBXVEZNb3ZlKG1fbGF5ZXJzKV0geyB9KTsK ICAgICB9KTsKIH0KIAotdm9pZCBSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2Vy OjpkaXNwYXRjaFRvVGhyZWFkKEZ1bmN0aW9uPHZvaWQoKT4mJiBjYWxsYmFjaykKLXsKLSAgICBt X3F1ZXVlLT5kaXNwYXRjaChXVEZNb3ZlKGNhbGxiYWNrKSk7Ci19Ci0KIGJvb2wgUmVtb3RlU2Ft cGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcjo6ZGlzcGF0Y2hNZXNzYWdlKElQQzo6Q29ubmVj dGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQogewogICAgIGlmICghZGVj b2Rlci5kZXN0aW5hdGlvbklEKCkpCkBAIC04NCw3ICs3OSw3IEBAIHZvaWQgUmVtb3RlU2FtcGxl QnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcjo6Y3JlYXRlTGF5ZXIoU2FtcGxlQnVmZmVyRGlzcGxh eUxheWVyCiAgICAgICAgIGF1dG8gbGF5ZXIgPSBSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5 ZXI6OmNyZWF0ZShtX2Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MsIGlkZW50aWZpZXIsIG1fY29ubmVj dGlvbi5jb3B5UmVmKCkpOwogICAgICAgICBhdXRvJiBsYXllclJlZmVyZW5jZSA9ICpsYXllcjsK ICAgICAgICAgbGF5ZXJSZWZlcmVuY2UuaW5pdGlhbGl6ZShoaWRlUm9vdExheWVyLCBzaXplLCBb dGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIGNhbGxiYWNrID0gV1RGTW92ZShj YWxsYmFjayksIGlkZW50aWZpZXIsIGxheWVyID0gV1RGTW92ZShsYXllcildKGF1dG8gbGF5ZXJJ ZCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICBkaXNwYXRjaFRvVGhyZWFkKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxi YWNrKSwgaWRlbnRpZmllciwgbGF5ZXIgPSBXVEZNb3ZlKGxheWVyKSwgbGF5ZXJJZCA9IFdURk1v dmUobGF5ZXJJZCldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChb dGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGNhbGxiYWNrID0g V1RGTW92ZShjYWxsYmFjayksIGlkZW50aWZpZXIsIGxheWVyID0gV1RGTW92ZShsYXllciksIGxh eWVySWQgPSBXVEZNb3ZlKGxheWVySWQpXSgpIG11dGFibGUgewogICAgICAgICAgICAgICAgIEFT U0VSVCghbV9sYXllcnMuY29udGFpbnMoaWRlbnRpZmllcikpOwogICAgICAgICAgICAgICAgIG1f bGF5ZXJzLmFkZChpZGVudGlmaWVyLCBXVEZNb3ZlKGxheWVyKSk7CiAgICAgICAgICAgICAgICAg Y2FsbGJhY2soV1RGTW92ZShsYXllcklkKSk7CkBAIC05Niw3ICs5MSw3IEBAIHZvaWQgUmVtb3Rl U2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlcjo6Y3JlYXRlTGF5ZXIoU2FtcGxlQnVmZmVy RGlzcGxheUxheWVyCiB2b2lkIFJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI6 OnJlbGVhc2VMYXllcihTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJJZGVudGlmaWVyIGlkZW50aWZp ZXIpCiB7CiAgICAgY2FsbE9uTWFpblJ1bkxvb3AoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWYg eyAqdGhpcyB9LCBpZGVudGlmaWVyXSgpIG11dGFibGUgewotICAgICAgICBkaXNwYXRjaFRvVGhy ZWFkKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgaWRlbnRp Zmllcl0geworICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGlkZW50aWZpZXJdIHsKICAgICAgICAgICAgIEFTU0VS VChtX2xheWVycy5jb250YWlucyhpZGVudGlmaWVyKSk7CiAgICAgICAgICAgICBjYWxsT25NYWlu UnVuTG9vcChbbGF5ZXIgPSBtX2xheWVycy50YWtlKGlkZW50aWZpZXIpXSB7IH0pOwogICAgICAg ICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvUmVtb3Rl U2FtcGxlQnVmZmVyRGlzcGxheUxheWVyTWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9HUFVQcm9j ZXNzL3dlYnJ0Yy9SZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyLmgKaW5kZXgg OGU2NjI2N2RjNTAyN2Y2MjI2YTNjZTM3NmUyN2RmZjUwNDEzNWU3OS4uMjg3MTBkNGE1ZjA5MjM0 ZWQzYzVjNmM4ZTJiMTk1NzkwODgxNmEwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL3dlYnJ0Yy9SZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyLmgKKysr IGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9SZW1vdGVTYW1wbGVCdWZmZXJEaXNw bGF5TGF5ZXJNYW5hZ2VyLmgKQEAgLTQ2LDcgKzQ2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBj bGFzcyBHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOwogY2xhc3MgUmVtb3RlU2FtcGxlQnVmZmVy RGlzcGxheUxheWVyOwogCi1jbGFzcyBSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5h Z2VyIGZpbmFsIDogcHVibGljIElQQzo6Q29ubmVjdGlvbjo6VGhyZWFkTWVzc2FnZVJlY2VpdmVy UmVmQ291bnRlZCB7CitjbGFzcyBSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2Vy IGZpbmFsIDogcHVibGljIElQQzo6Q29ubmVjdGlvbjo6V29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVy IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVm PFJlbW90ZVNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllck1hbmFnZXI+IGNyZWF0ZShHUFVDb25uZWN0 aW9uVG9XZWJQcm9jZXNzJiBjb25uZWN0aW9uKQpAQCAtNjUsMTEgKzY1LDkgQEAgcHJpdmF0ZToK ICAgICBleHBsaWNpdCBSZW1vdGVTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXJNYW5hZ2VyKEdQVUNv bm5lY3Rpb25Ub1dlYlByb2Nlc3MmKTsKICAgICB2b2lkIHN0YXJ0TGlzdGVuaW5nRm9ySVBDKCk7 CiAKLSAgICAvLyBJUEM6OkNvbm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZlcgotICAgIHZv aWQgZGlzcGF0Y2hUb1RocmVhZChGdW5jdGlvbjx2b2lkKCk+JiYpIGZpbmFsOwotCi0gICAgLy8g SVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICAvLyBJUEM6OkNvbm5lY3Rpb246OldvcmtRdWV1ZU1l c3NhZ2VSZWNlaXZlciBvdmVycmlkZXMuCiAgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6 OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKwogICAgIGJvb2wgZGlzcGF0Y2hN ZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpOwogCiAgICAgdXNpbmcgTGF5 ZXJDcmVhdGlvbkNhbGxiYWNrID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChzdGQ6Om9wdGlvbmFs PExheWVySG9zdGluZ0NvbnRleHRJRD4pPiYmOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5jcHAKaW5kZXggZjE0MTliNzQ5 NzhlZTdlNDk3Yjg5NmQyMDdiMzc0ODRiOGRiMTdlOS4uMTVhZDJlMmU0NWIyMGYxMGZhMzIwYTg4 M2M0OGQ5YWZiNmVlMzk3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQ VS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuY3BwCkBAIC0xODYsNyArMTg2LDcgQEAgdm9p ZCBMaWJXZWJSVENDb2RlY3M6OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uT25NYWluVGhyZWFk V2l0aExvY2soKQogICAgIGdwdUNvbm5lY3Rpb24uYWRkQ2xpZW50KCp0aGlzKTsKICAgICBtX2Nv bm5lY3Rpb24gPSAmZ3B1Q29ubmVjdGlvbi5jb25uZWN0aW9uKCk7CiAgICAgbV92aWRlb0ZyYW1l T2JqZWN0SGVhcFByb3h5ID0gJmdwdUNvbm5lY3Rpb24udmlkZW9GcmFtZU9iamVjdEhlYXBQcm94 eSgpOwotICAgIG1fY29ubmVjdGlvbi0+YWRkVGhyZWFkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpMaWJXZWJSVENDb2RlY3M6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgdGhpcyk7CisgICAgbV9j b25uZWN0aW9uLT5hZGRXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkxpYldlYlJU Q0NvZGVjczo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3F1ZXVlLCAqdGhpcyk7CiAKICAgICBp ZiAobV9sb2dnaW5nTGV2ZWwpCiAgICAgICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6 TGliV2ViUlRDQ29kZWNzUHJveHk6OlNldFJUQ0xvZ2dpbmdMZXZlbCB7ICptX2xvZ2dpbmdMZXZl bCB9LCAwKTsKQEAgLTIwMSw3ICsyMDEsNyBAQCB2b2lkIExpYldlYlJUQ0NvZGVjczo6ZW5zdXJl R1BVUHJvY2Vzc0Nvbm5lY3Rpb25BbmREaXNwYXRjaFRvVGhyZWFkKEZ1bmN0aW9uPHZvaQogCiAg ICAgLy8gRmFzdCBwYXRoIHdoZW4gd2UgYWxyZWFkeSBoYXZlIGEgY29ubmVjdGlvbi4KICAgICBp ZiAobV9jb25uZWN0aW9uKSB7Ci0gICAgICAgIGRpc3BhdGNoVG9UaHJlYWQoV1RGTW92ZSh0YXNr KSk7CisgICAgICAgIG1fcXVldWUtPmRpc3BhdGNoKFdURk1vdmUodGFzaykpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCkBAIC0yMTQsNyArMjE0LDcgQEAgdm9pZCBMaWJXZWJSVENDb2RlY3M6 OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uQW5kRGlzcGF0Y2hUb1RocmVhZChGdW5jdGlvbjx2 b2kKICAgICAgICAgTG9ja2VyIGxvY2tlciB7IG1fY29ubmVjdGlvbkxvY2sgfTsKICAgICAgICAg ZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb25Pbk1haW5UaHJlYWRXaXRoTG9jaygpOwogICAgICAg ICBmb3IgKGF1dG8mIHRhc2sgOiBzdGQ6OmV4Y2hhbmdlKG1fdGFza3NUb0Rpc3BhdGNoQWZ0ZXJF c3RhYmxpc2hpbmdDb25uZWN0aW9uLCB7IH0pKQotICAgICAgICAgICAgZGlzcGF0Y2hUb1RocmVh ZChXVEZNb3ZlKHRhc2spKTsKKyAgICAgICAgICAgIG1fcXVldWUtPmRpc3BhdGNoKFdURk1vdmUo dGFzaykpOwogICAgIH0pOwogfQogCkBAIC01NjgsMjIgKzU2OCwxNyBAQCBDVlBpeGVsQnVmZmVy UG9vbFJlZiBMaWJXZWJSVENDb2RlY3M6OnBpeGVsQnVmZmVyUG9vbChzaXplX3Qgd2lkdGgsIHNp emVfdCBoZWlnaAogICAgIHJldHVybiBtX3BpeGVsQnVmZmVyUG9vbC5nZXQoKTsKIH0KIAotdm9p ZCBMaWJXZWJSVENDb2RlY3M6OmRpc3BhdGNoVG9UaHJlYWQoRnVuY3Rpb248dm9pZCgpPiYmIGNh bGxiYWNrKQotewotICAgIG1fcXVldWUtPmRpc3BhdGNoKFdURk1vdmUoY2FsbGJhY2spKTsKLX0K LQogdm9pZCBMaWJXZWJSVENDb2RlY3M6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BV UHJvY2Vzc0Nvbm5lY3Rpb24mKQogewogICAgIEFTU0VSVChpc01haW5SdW5Mb29wKCkpOwogCiAg ICAgTG9ja2VyIGxvY2tlciB7IG1fY29ubmVjdGlvbkxvY2sgfTsKLSAgICBzdGQ6OmV4Y2hhbmdl KG1fY29ubmVjdGlvbiwgbnVsbHB0ciktPnJlbW92ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6TGliV2ViUlRDQ29kZWNzOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworICAgIHN0ZDo6 ZXhjaGFuZ2UobV9jb25uZWN0aW9uLCBudWxscHRyKS0+cmVtb3ZlV29ya1F1ZXVlTWVzc2FnZVJl Y2VpdmVyKE1lc3NhZ2VzOjpMaWJXZWJSVENDb2RlY3M6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7 CiAgICAgaWYgKCFtX25lZWRzR1BVUHJvY2Vzc0Nvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybjsK IAogICAgIGVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uT25NYWluVGhyZWFkV2l0aExvY2soKTsK LSAgICBkaXNwYXRjaFRvVGhyZWFkKFt0aGlzLCBjb25uZWN0aW9uID0gbV9jb25uZWN0aW9uXSgp IHsKKyAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgY29ubmVjdGlvbiA9IG1fY29ubmVjdGlv bl0oKSB7CiAgICAgICAgIGFzc2VydElzQ3VycmVudCh3b3JrUXVldWUoKSk7CiAgICAgICAgIHsK ICAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBtX2Nvbm5lY3Rpb25Mb2NrIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3Mu aCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5o CmluZGV4IDAyZGNjYWM4NDAwMTAwMzgxZWY0Y2NjZGJkZDdkMjQ2MGU5NjU0M2MuLjBmOTA2Yzg0 OTMzZThmNmYwZjc4MzI5ODE2ZjU2ZjI1ZWEwNDljY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5oCkBAIC02MCw3ICs2 MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBSZW1vdGVWaWRlb0ZyYW1lT2JqZWN0 SGVhcFByb3h5OwogCi1jbGFzcyBMaWJXZWJSVENDb2RlY3MgOiBwdWJsaWMgSVBDOjpDb25uZWN0 aW9uOjpUaHJlYWRNZXNzYWdlUmVjZWl2ZXJSZWZDb3VudGVkLCBwdWJsaWMgR1BVUHJvY2Vzc0Nv bm5lY3Rpb246OkNsaWVudCB7CitjbGFzcyBMaWJXZWJSVENDb2RlY3MgOiBwdWJsaWMgSVBDOjpD b25uZWN0aW9uOjpXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIsIHB1YmxpYyBHUFVQcm9jZXNzQ29u bmVjdGlvbjo6Q2xpZW50IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoK ICAgICBzdGF0aWMgUmVmPExpYldlYlJUQ0NvZGVjcz4gY3JlYXRlKCk7CkBAIC0xMzUsOSArMTM1 LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXBsZXRlZEVuY29kaW5nKFJUQ0VuY29kZXJJZGVu dGlmaWVyLCBJUEM6OkRhdGFSZWZlcmVuY2UmJiwgY29uc3Qgd2VicnRjOjpXZWJLaXRFbmNvZGVk RnJhbWVJbmZvJik7CiAgICAgUmV0YWluUHRyPENWUGl4ZWxCdWZmZXJSZWY+IGNvbnZlcnRUb0JH UkEoQ1ZQaXhlbEJ1ZmZlclJlZik7CiAKLSAgICAvLyBJUEM6OkNvbm5lY3Rpb246OlRocmVhZE1l c3NhZ2VSZWNlaXZlcgotICAgIHZvaWQgZGlzcGF0Y2hUb1RocmVhZChGdW5jdGlvbjx2b2lkKCk+ JiYpIGZpbmFsOwotCiAgICAgLy8gR1BVUHJvY2Vzc0Nvbm5lY3Rpb246OkNsaWVudAogICAgIHZv aWQgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRDbG9zZShHUFVQcm9jZXNzQ29ubmVjdGlvbiYpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2FwdHVy ZVNhbXBsZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1JlbW90 ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyLmNwcAppbmRleCBmZmJmYTMxZmVhMGQyMThjOGNiNTUwNzQ1 OTQxMjQ3NWQyNjhmNzE0Li5mYTlhYWU1NGI4NTQyODJlOGJiYmM2MGY0M2M3OTI3ZmM4MjQyMDVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2FwdHVy ZVNhbXBsZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9S ZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlci5jcHAKQEAgLTU0LDcgKzU0LDcgQEAgUmVtb3RlQ2Fw dHVyZVNhbXBsZU1hbmFnZXI6On5SZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlcigpCiB2b2lkIFJl bW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpzdG9wTGlzdGVuaW5nRm9ySVBDKCkKIHsKICAgICBp ZiAobV9pc1JlZ2lzdGVyZWRUb1BhcmVudFByb2Nlc3NDb25uZWN0aW9uKQotICAgICAgICBXZWJQ cm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5yZW1vdmVUaHJl YWRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5w YXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5yZW1vdmVXb3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjptZXNzYWdlUmVjZWl2ZXJOYW1l KCkpOwogICAgIHNldENvbm5lY3Rpb24obnVsbHB0cik7CiB9CiAKQEAgLTY3LDE3ICs2NywxNyBA QCB2b2lkIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpzZXRDb25uZWN0aW9uKElQQzo6Q29u bmVjdGlvbiogY29ubmVjdGlvbikKICAgICBpZiAoY29ubmVjdGlvbiA9PSBwYXJlbnRDb25uZWN0 aW9uKSB7CiAgICAgICAgIGlmICghbV9pc1JlZ2lzdGVyZWRUb1BhcmVudFByb2Nlc3NDb25uZWN0 aW9uKSB7CiAgICAgICAgICAgICBtX2lzUmVnaXN0ZXJlZFRvUGFyZW50UHJvY2Vzc0Nvbm5lY3Rp b24gPSB0cnVlOwotICAgICAgICAgICAgcGFyZW50Q29ubmVjdGlvbi0+YWRkVGhyZWFkTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlcjo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCB0aGlzKTsKKyAgICAgICAgICAgIHBhcmVudENvbm5lY3Rpb24tPmFkZFdv cmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFn ZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9xdWV1ZSwgKnRoaXMpOwogICAgICAgICB9CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKG1fY29ubmVjdGlvbikKLSAgICAgICAgbV9j b25uZWN0aW9uLT5yZW1vdmVUaHJlYWRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJlbW90ZUNh cHR1cmVTYW1wbGVNYW5hZ2VyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworICAgICAgICBtX2Nv bm5lY3Rpb24tPnJlbW92ZVdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3Rl Q2FwdHVyZVNhbXBsZU1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CiAKICAgICBtX2Nv bm5lY3Rpb24gPSBXVEZNb3ZlKGNvbm5lY3Rpb24pOwogCiAgICAgaWYgKG1fY29ubmVjdGlvbikK LSAgICAgICAgbV9jb25uZWN0aW9uLT5hZGRUaHJlYWRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OlJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIHRoaXMp OworICAgICAgICBtX2Nvbm5lY3Rpb24tPmFkZFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6UmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9xdWV1ZSwgKnRoaXMpOwogfQogCiB2b2lkIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjph ZGRTb3VyY2UoUmVmPFJlbW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2U+JiYgc291cmNlKQpAQCAtMTI4 LDExICsxMjgsNiBAQCB2b2lkIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyOjpzZXRWaWRlb0Zy YW1lT2JqZWN0SGVhcFByb3h5KFJlbW90ZVZpZGVvRnJhbWVPYgogICAgIG1fdmlkZW9GcmFtZU9i amVjdEhlYXBQcm94eSA9IHByb3h5OwogfQogCi12b2lkIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5h Z2VyOjpkaXNwYXRjaFRvVGhyZWFkKEZ1bmN0aW9uPHZvaWQoKT4mJiBjYWxsYmFjaykKLXsKLSAg ICBtX3F1ZXVlLT5kaXNwYXRjaChXVEZNb3ZlKGNhbGxiYWNrKSk7Ci19Ci0KIHZvaWQgUmVtb3Rl Q2FwdHVyZVNhbXBsZU1hbmFnZXI6OmF1ZGlvU3RvcmFnZUNoYW5nZWQoV2ViQ29yZTo6UmVhbHRp bWVNZWRpYVNvdXJjZUlkZW50aWZpZXIgaWRlbnRpZmllciwgY29uc3QgU2hhcmVkTWVtb3J5OjpJ UENIYW5kbGUmIGlwY0hhbmRsZSwgY29uc3QgV2ViQ29yZTo6Q0FBdWRpb1N0cmVhbURlc2NyaXB0 aW9uJiBkZXNjcmlwdGlvbiwgdWludDY0X3QgbnVtYmVyT2ZGcmFtZXMsIElQQzo6U2VtYXBob3Jl JiYgc2VtYXBob3JlLCBjb25zdCBNZWRpYVRpbWUmIG1lZGlhVGltZSwgc2l6ZV90IGZyYW1lQ2h1 bmtTaXplKQogewogICAgIEFTU0VSVCghV1RGOjppc01haW5SdW5Mb29wKCkpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1JlbW90ZUNhcHR1cmVTYW1wbGVNYW5h Z2VyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2FwdHVyZVNhbXBs ZU1hbmFnZXIuaAppbmRleCA1ZTNmODM0MDc2OGJiZThhOWNiODljNDgyN2EzMmE5MTdlOTM4N2Qw Li45OGZlYWIyYjI5NzY2NTQwMzI4ZGI4YWMxZDRlNGE4NmU5YzE4Nzc4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlQ2FwdHVyZVNhbXBs ZU1hbmFnZXIuaApAQCAtNDksNyArNDksNyBAQCBjbGFzcyBJbWFnZVRyYW5zZmVyU2Vzc2lvblZU OwogbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBSZW1vdGVWaWRlb0ZyYW1lT2JqZWN0SGVhcFBy b3h5OwogCi1jbGFzcyBSZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlciA6IHB1YmxpYyBJUEM6OkNv bm5lY3Rpb246OlRocmVhZE1lc3NhZ2VSZWNlaXZlclJlZkNvdW50ZWQgeworY2xhc3MgUmVtb3Rl Q2FwdHVyZVNhbXBsZU1hbmFnZXIgOiBwdWJsaWMgSVBDOjpDb25uZWN0aW9uOjpXb3JrUXVldWVN ZXNzYWdlUmVjZWl2ZXIgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgog ICAgIFJlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyKCk7CkBAIC02MywxMiArNjMsMTAgQEAgcHVi bGljOgogICAgIHZvaWQgZGlkVXBkYXRlU291cmNlQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rpb24q KTsKICAgICB2b2lkIHNldFZpZGVvRnJhbWVPYmplY3RIZWFwUHJveHkoUmVtb3RlVmlkZW9GcmFt ZU9iamVjdEhlYXBQcm94eSopOwogCisgICAgLy8gSVBDOjpDb25uZWN0aW9uOjpXb3JrUXVldWVN ZXNzYWdlUmVjZWl2ZXIgb3ZlcnJpZGVzLgogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBD OjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJik7CiAKIHByaXZhdGU6Ci0gICAgLy8gSVBDOjpD b25uZWN0aW9uOjpUaHJlYWRNZXNzYWdlUmVjZWl2ZXIKLSAgICB2b2lkIGRpc3BhdGNoVG9UaHJl YWQoRnVuY3Rpb248dm9pZCgpPiYmKSBmaW5hbDsKLQogICAgIC8vIE1lc3NhZ2VzCiAgICAgdm9p ZCBhdWRpb1N0b3JhZ2VDaGFuZ2VkKFdlYkNvcmU6OlJlYWx0aW1lTWVkaWFTb3VyY2VJZGVudGlm aWVyLCBjb25zdCBTaGFyZWRNZW1vcnk6OklQQ0hhbmRsZSYsIGNvbnN0IFdlYkNvcmU6OkNBQXVk aW9TdHJlYW1EZXNjcmlwdGlvbiYsIHVpbnQ2NF90IG51bWJlck9mRnJhbWVzLCBJUEM6OlNlbWFw aG9yZSYmLCBjb25zdCBNZWRpYVRpbWUmLCBzaXplX3QgZnJhbWVTYW1wbGVTaXplKTsKICAgICB2 b2lkIGF1ZGlvU2FtcGxlc0F2YWlsYWJsZShXZWJDb3JlOjpSZWFsdGltZU1lZGlhU291cmNlSWRl bnRpZmllciwgTWVkaWFUaW1lLCB1aW50NjRfdCBudW1iZXJPZkZyYW1lcyk7Cg==