237959 2022-03-16 08:36:59 -0700 [model] -[ASVInlinePreview setRemoteContext:] should be called inside the -[ASVInlinePreview setupRemoteConnectionWithCompletionHandler:] callback 2022-03-17 00:54:03 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino thorton webkit-bug-importer oldest_to_newest 1851821 0 graouts 2022-03-16 08:36:59 -0700 [model] -[ASVInlinePreview setRemoteContext:] should be called inside the -[ASVInlinePreview setupRemoteConnectionWithCompletionHandler:] callback 1851830 1 454840 graouts 2022-03-16 08:41:18 -0700 Created attachment 454840 Patch 1851832 2 graouts 2022-03-16 08:42:01 -0700 rdar://87832635 1851936 3 ews-feeder 2022-03-16 12:35:30 -0700 Traceback (most recent call last): File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 348, in parse_entries_from_file raise StopIteration StopIteration The above exception was the direct cause of the following exception: Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 80, in <module> main() File "Tools/Scripts/webkit-patch", line 75, in main WebKitPatch(os.path.abspath(__file__)).main() File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 305, in main result = command.check_arguments_and_execute(options, args, self) File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 123, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 55, in execute self._sequence.run_and_handle_errors(tool, options, state) File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 73, in run_and_handle_errors self._run(tool, options, state) File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 67, in _run step(tool, options).run(state) File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 52, in run changelog_entry = ChangeLog(changelog_path).latest_entry() File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 377, in latest_entry return self.parse_latest_entry_from_file(changelog_file) File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 323, in parse_latest_entry_from_file return next(cls.parse_entries_from_file(changelog_file)) RuntimeError: generator raised StopIteration 1852165 4 graouts 2022-03-17 00:54:03 -0700 Committed r291393 (?): <https://commits.webkit.org/r291393> 454840 2022-03-16 08:41:18 -0700 2022-03-16 12:35:31 -0700 Patch bug-237959-20220316164117.patch text/plain 21165 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE5OGQzYWUwYTZlNTkwNzk0 ODY5OTYwOTM5OTZlZDc2NTM4OGZhZmQuLjBmOTA3NmMwZjQ3MGVkZjVhOTljZTljOWZiOWU5NjAw YzA1OTA5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKyAgICAyMDIyLTAzLTE2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFttb2RlbF0gLVtBU1ZJ bmxpbmVQcmV2aWV3IHNldFJlbW90ZUNvbnRleHQ6XSBzaG91bGQgYmUgY2FsbGVkIGluc2lkZSB0 aGUgLVtBU1ZJbmxpbmVQcmV2aWV3IHNldHVwUmVtb3RlQ29ubmVjdGlvbldpdGhDb21wbGV0aW9u SGFuZGxlcjpdIGNhbGxiYWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzc5NTkKKyAgICAgICAgcmRhcjovLzg3ODMyNjM1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0byBzcGxpdCB0aGUg Y29kZSB0aGF0IGNyZWF0ZXMgYSByZW1vdGUgQVNWSW5saW5lUHJldmlldyBvbiBtYWNPUyBpbiB0 d28uIFRoZSBmaXJzdCBzdGVwIGlzIHRvIGNyZWF0ZSB0aGUgcmVtb3RlIEFTVklubGluZVByZXZp ZXcKKyAgICAgICAgYW5kIG9idGFpbiBpdHMgcmVtb3RlIGNvbnRleHQgaWQgZnJvbSB0aGUgVUlQ cm9jZXNzLCBzZXR0aW5nIGl0IG9uIHRoZSBXZWJQcm9jZXNzIEFTVklubGluZVByZXZpZXcgaW4g dGhlIGNhbGxiYWNrLgorCisgICAgICAgIFRoZSBzZWNvbmQgc3RlcCBpcyB0byBsb2FkIHRoZSBm aWxlIGluIHRoZSByZW1vdGUgQVNWSW5saW5lUHJldmlldy4KKworICAgICAgICBGb3IgdGhlc2Ug dHdvIHN0ZXBzLCB3ZSBub3cgaGF2ZSB0d28gc2VwYXJhdGUgV2ViUHJveHkgbWVzc2FnZXM6IE1v ZGVsRWxlbWVudENyZWF0ZVJlbW90ZVByZXZpZXcgYW5kIE1vZGVsRWxlbWVudExvYWRSZW1vdGVQ cmV2aWV3LgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL01vZGVsRWxlbWVudENvbnRyb2xs ZXJDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TW9kZWxFbGVtZW50Q29udHJvbGxlcjo6bW9k ZWxFbGVtZW50Q3JlYXRlUmVtb3RlUHJldmlldyk6CisgICAgICAgIChXZWJLaXQ6Ok1vZGVsRWxl bWVudENvbnRyb2xsZXI6Om1vZGVsRWxlbWVudExvYWRSZW1vdGVQcmV2aWV3KToKKyAgICAgICAg KFdlYktpdDo6TW9kZWxFbGVtZW50Q29udHJvbGxlcjo6bW9kZWxFbGVtZW50RGlkQ3JlYXRlUHJl dmlldyk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL01vZGVsRWxlbWVudENvbnRyb2xs ZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5Ojptb2RlbEVsZW1lbnRDcmVhdGVSZW1vdGVQcmV2aWV3KToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojptb2RlbEVsZW1lbnRMb2FkUmVtb3RlUHJldmll dyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bW9kZWxFbGVtZW50RGlkQ3JlYXRl UHJldmlldyk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICog V2ViUHJvY2Vzcy9Nb2RlbC9tYWMvQVJLaXRJbmxpbmVQcmV2aWV3TW9kZWxQbGF5ZXJNYWMuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL01vZGVsL21hYy9BUktpdElubGluZVByZXZpZXdNb2RlbFBs YXllck1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6QVJLaXRJbmxpbmVQcmV2aWV3TW9kZWxQbGF5 ZXJNYWM6OmxvYWQpOgorICAgICAgICAoV2ViS2l0OjpBUktpdElubGluZVByZXZpZXdNb2RlbFBs YXllck1hYzo6Y3JlYXRlUHJldmlld3NGb3JNb2RlbFdpdGhVUkwpOgorICAgICAgICAoV2ViS2l0 OjpBUktpdElubGluZVByZXZpZXdNb2RlbFBsYXllck1hYzo6ZGlkQ3JlYXRlUmVtb3RlUHJldmll d0Zvck1vZGVsV2l0aFVSTCk6CisKIDIwMjItMDMtMTYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgTUlNRVR5cGVSZWdpc3RyeTo6bWltZVR5cGVGb3JQ YXRoIHRha2UgYSBTdHJpbmdWaWV3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9Nb2RlbEVsZW1lbnRDb250cm9sbGVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9Nb2RlbEVsZW1lbnRDb250cm9sbGVyQ29jb2EubW0KaW5kZXggNTg5YTcx YjZiNjNiMTZkYmEwZTI4NWFkOTg0M2I4M2ZmZWYzMzhhNS4uYTVlMTBmYzkxZDhkNzBjNDAxZmFl MzBiZTY5OWExOWI5MjY2N2MxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvTW9kZWxFbGVtZW50Q29udHJvbGxlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL01vZGVsRWxlbWVudENvbnRyb2xsZXJDb2NvYS5tbQpAQCAtMTUyLDcg KzE1Miw3IEBAIEFTVklubGluZVByZXZpZXcgKiBNb2RlbEVsZW1lbnRDb250cm9sbGVyOjpwcmV2 aWV3Rm9yTW9kZWxJZGVudGlmaWVyKE1vZGVsSWRlbnRpCiAgICAgcmV0dXJuIG1faW5saW5lUHJl dmlld3MuZ2V0KG1vZGVsSWRlbnRpZmllci51dWlkKS5nZXQoKTsKIH0KIAotdm9pZCBNb2RlbEVs ZW1lbnRDb250cm9sbGVyOjptb2RlbEVsZW1lbnREaWRDcmVhdGVQcmV2aWV3KFVSTCBmaWxlVVJM LCBTdHJpbmcgdXVpZCwgV2ViQ29yZTo6RmxvYXRTaXplIHNpemUsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoRXhwZWN0ZWQ8c3RkOjpwYWlyPFN0cmluZywgdWludDMyX3Q+LCBXZWJDb3JlOjpSZXNv dXJjZUVycm9yPik+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIE1vZGVsRWxlbWVudENvbnRy b2xsZXI6Om1vZGVsRWxlbWVudENyZWF0ZVJlbW90ZVByZXZpZXcoU3RyaW5nIHV1aWQsIFdlYkNv cmU6OkZsb2F0U2l6ZSBzaXplLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVjdGVkPHN0ZDo6 cGFpcjxTdHJpbmcsIHVpbnQzMl90PiwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvcj4pPiYmIGNvbXBs ZXRpb25IYW5kbGVyKQogewogICAgIGlmICghbV93ZWJQYWdlUHJveHkucHJlZmVyZW5jZXMoKS5t b2RlbEVsZW1lbnRFbmFibGVkKCkpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobWFrZVVu ZXhwZWN0ZWQoV2ViQ29yZTo6UmVzb3VyY2VFcnJvciB7IFdlYkNvcmU6OmVycm9yRG9tYWluV2Vi S2l0SW50ZXJuYWwsIDAsIHsgfSwgIk1vZGVsIGVsZW1lbnQgZGlzYWJsZWQiX3MgfSkpOwpAQCAt MTcwLDE1ICsxNzAsMTIgQEAgdm9pZCBNb2RlbEVsZW1lbnRDb250cm9sbGVyOjptb2RlbEVsZW1l bnREaWRDcmVhdGVQcmV2aWV3KFVSTCBmaWxlVVJMLCBTdHJpbmcgdXUKICAgICBlbHNlCiAgICAg ICAgIGl0ZXJhdG9yLT52YWx1ZSA9IHByZXZpZXc7CiAKLSAgICAvLyBGSVhNRTogV2h5IGlzIHRo aXMgbm90IGp1c3QgdXNpbmcgbm9ybWFsIFVSTCAtPiBOU1VSTCBjb252ZXJzaW9uPwotICAgIGF1 dG8gdXJsID0gYWRvcHROUyhbW05TVVJMIGFsbG9jXSBpbml0RmlsZVVSTFdpdGhQYXRoOmZpbGVV UkwuZmlsZVN5c3RlbVBhdGgoKV0pOwotCi0gICAgYXV0byBoYW5kbGVyID0gQ29tcGxldGlvbkhh bmRsZXJXaXRoRmluYWxpemVyPHZvaWQoRXhwZWN0ZWQ8c3RkOjpwYWlyPFN0cmluZywgdWludDMy X3Q+LCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yPik+KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp LCBbdXJsXSAoRnVuY3Rpb248dm9pZChFeHBlY3RlZDxzdGQ6OnBhaXI8U3RyaW5nLCB1aW50MzJf dD4sIFdlYkNvcmU6OlJlc291cmNlRXJyb3I+KT4mIGNvbXBsZXRpb25IYW5kbGVyKSB7CisgICAg YXV0byBoYW5kbGVyID0gQ29tcGxldGlvbkhhbmRsZXJXaXRoRmluYWxpemVyPHZvaWQoRXhwZWN0 ZWQ8c3RkOjpwYWlyPFN0cmluZywgdWludDMyX3Q+LCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yPik+ KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBbXSAoRnVuY3Rpb248dm9pZChFeHBlY3RlZDxz dGQ6OnBhaXI8U3RyaW5nLCB1aW50MzJfdD4sIFdlYkNvcmU6OlJlc291cmNlRXJyb3I+KT4mIGNv bXBsZXRpb25IYW5kbGVyKSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG1ha2VVbmV4cGVj dGVkKFdlYkNvcmU6OlJlc291cmNlRXJyb3IgeyBXZWJDb3JlOjpSZXNvdXJjZUVycm9yOjpUeXBl OjpHZW5lcmFsIH0pKTsKICAgICB9KTsKIAogICAgIFJFTEVBU0VfQVNTRVJUKGlzTWFpblJ1bkxv b3AoKSk7Ci0gICAgW3ByZXZpZXcgc2V0dXBSZW1vdGVDb25uZWN0aW9uV2l0aENvbXBsZXRpb25I YW5kbGVyOm1ha2VCbG9ja1B0cihbd2Vha1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgcHJldmll dywgdXVpZCA9IFdURk1vdmUodXVpZCksIHVybCA9IFdURk1vdmUodXJsKSwgaGFuZGxlciA9IFdU Rk1vdmUoaGFuZGxlcildIChOU0Vycm9yICpjb250ZXh0RXJyb3IpIG11dGFibGUgeworICAgIFtw cmV2aWV3IHNldHVwUmVtb3RlQ29ubmVjdGlvbldpdGhDb21wbGV0aW9uSGFuZGxlcjptYWtlQmxv Y2tQdHIoW3dlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIHByZXZpZXcsIHV1aWQgPSBXVEZN b3ZlKHV1aWQpLCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKV0gKE5TRXJyb3IgKmNvbnRleHRF cnJvcikgbXV0YWJsZSB7CiAgICAgICAgIGlmIChjb250ZXh0RXJyb3IpIHsKICAgICAgICAgICAg IExPRyhNb2RlbEVsZW1lbnQsICJVbmFibGUgdG8gY3JlYXRlIHJlbW90ZSBjb25uZWN0aW9uIGZv ciB1dWlkICVzOiAlQC4iLCB1dWlkLnV0ZjgoKS5kYXRhKCksIGNvbnRleHRFcnJvci5sb2NhbGl6 ZWREZXNjcmlwdGlvbik7CiAKQEAgLTE5MywyOSArMTkwLDUzIEBAIHZvaWQgTW9kZWxFbGVtZW50 Q29udHJvbGxlcjo6bW9kZWxFbGVtZW50RGlkQ3JlYXRlUHJldmlldyhVUkwgZmlsZVVSTCwgU3Ry aW5nIHV1CiAKICAgICAgICAgTE9HKE1vZGVsRWxlbWVudCwgIkVzdGFibGlzaGVkIHJlbW90ZSBj b25uZWN0aW9uIHdpdGggVVVJRCAlcy4iLCB1dWlkLnV0ZjgoKS5kYXRhKCkpOwogCi0gICAgICAg IFtwcmV2aWV3IHByZXBhcmVQcmV2aWV3T2ZGaWxlQXRVUkw6dXJsLmdldCgpIGNvbXBsZXRpb25I YW5kbGVyOm1ha2VCbG9ja1B0cihbd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlzKSwgcHJldmll dywgdXVpZCA9IFdURk1vdmUodXVpZCksIHVybCA9IFdURk1vdmUodXJsKSwgaGFuZGxlciA9IFdU Rk1vdmUoaGFuZGxlcildIChOU0Vycm9yICpsb2FkRXJyb3IpIG11dGFibGUgewotICAgICAgICAg ICAgaWYgKGxvYWRFcnJvcikgewotICAgICAgICAgICAgICAgIExPRyhNb2RlbEVsZW1lbnQsICJV bmFibGUgdG8gbG9hZCBmaWxlIGZvciB1dWlkICVzOiAlQC4iLCB1dWlkLnV0ZjgoKS5kYXRhKCks IGxvYWRFcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbik7CisgICAgICAgIGF1dG8gY29udGV4dElk ID0gW3ByZXZpZXcgY29udGV4dElkXTsKKyAgICAgICAgY2FsbE9uTWFpblJ1bkxvb3AoW3dlYWtU aGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIHV1aWQgPSBXVEZNb3ZlKHV1aWQpLCBoYW5kbGVyID0g V1RGTW92ZShoYW5kbGVyKSwgY29udGV4dElkXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGlm ICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICAgICAg Y2FsbE9uTWFpblJ1bkxvb3AoW3dlYWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIGhhbmRsZXIg PSBXVEZNb3ZlKGhhbmRsZXIpLCBlcnJvciA9IFdlYkNvcmU6OlJlc291cmNlRXJyb3IgeyBsb2Fk RXJyb3IgfV0gKCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmICghd2Vha1RoaXMp Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBoYW5kbGVyKHN0 ZDo6bWFrZV9wYWlyKHV1aWQsIGNvbnRleHRJZCkpOworICAgICAgICB9KTsKKyAgICB9KS5nZXQo KV07Cit9CiAKLSAgICAgICAgICAgICAgICAgICAgaGFuZGxlcihtYWtlVW5leHBlY3RlZChlcnJv cikpOwotICAgICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAgICAgIH0KK3ZvaWQgTW9kZWxFbGVtZW50Q29udHJvbGxlcjo6bW9kZWxFbGVtZW50TG9hZFJl bW90ZVByZXZpZXcoU3RyaW5nIHV1aWQsIFVSTCBmaWxlVVJMLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6UmVzb3VyY2VFcnJvcj4mJik+JiYgY29tcGxldGlv bkhhbmRsZXIpCit7CisgICAgaWYgKCFtX3dlYlBhZ2VQcm94eS5wcmVmZXJlbmNlcygpLm1vZGVs RWxlbWVudEVuYWJsZWQoKSkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXZWJDb3JlOjpS ZXNvdXJjZUVycm9yIHsgV2ViQ29yZTo6ZXJyb3JEb21haW5XZWJLaXRJbnRlcm5hbCwgMCwgeyB9 LCAiTW9kZWwgZWxlbWVudCBkaXNhYmxlZCJfcyB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K IAotICAgICAgICAgICAgTE9HKE1vZGVsRWxlbWVudCwgIkxvYWRlZCBmaWxlIHdpdGggVVVJRCAl cy4iLCB1dWlkLnV0ZjgoKS5kYXRhKCkpOworICAgIGF1dG8gcHJldmlldyA9IHByZXZpZXdGb3JV VUlEKHV1aWQpOworICAgIGlmICghcHJldmlldykKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo V2ViQ29yZTo6UmVzb3VyY2VFcnJvciB7IFdlYkNvcmU6OmVycm9yRG9tYWluV2ViS2l0SW50ZXJu YWwsIDAsIHsgfSwgIkNvdWxkIG5vdCBmaW5kIGEgcHJldmlldyBmb3IgdGhlIHByb3ZpZGVkIFVV SUQiX3MgfSk7CisKKyAgICBhdXRvIGhhbmRsZXIgPSBDb21wbGV0aW9uSGFuZGxlcldpdGhGaW5h bGl6ZXI8dm9pZChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlJlc291cmNlRXJyb3I+JiYpPihXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgW10oRnVuY3Rpb248dm9pZChzdGQ6Om9wdGlvbmFsPFdl YkNvcmU6OlJlc291cmNlRXJyb3I+JiYpPiYgY29tcGxldGlvbkhhbmRsZXIpIHsKKyAgICAgICAg Y29tcGxldGlvbkhhbmRsZXIoV2ViQ29yZTo6UmVzb3VyY2VFcnJvciB7IFdlYkNvcmU6OlJlc291 cmNlRXJyb3I6OlR5cGU6OkdlbmVyYWwgfSk7CisgICAgfSk7CiAKLSAgICAgICAgICAgIGF1dG8g Y29udGV4dElkID0gW3ByZXZpZXcgY29udGV4dElkXTsKLSAgICAgICAgICAgIGNhbGxPbk1haW5S dW5Mb29wKFt3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCB1dWlkID0gV1RGTW92ZSh1dWlk KSwgaGFuZGxlciA9IFdURk1vdmUoaGFuZGxlciksIGNvbnRleHRJZF0gKCkgbXV0YWJsZSB7Cisg ICAgUkVMRUFTRV9BU1NFUlQoaXNNYWluUnVuTG9vcCgpKTsKKyAgICBbcHJldmlldyBwcmVwYXJl UHJldmlld09mRmlsZUF0VVJMOltbTlNVUkwgYWxsb2NdIGluaXRGaWxlVVJMV2l0aFBhdGg6Zmls ZVVSTC5maWxlU3lzdGVtUGF0aCgpXSBjb21wbGV0aW9uSGFuZGxlcjptYWtlQmxvY2tQdHIoW3dl YWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIHV1aWQgPSBXVEZNb3ZlKHV1aWQpLCBoYW5kbGVy ID0gV1RGTW92ZShoYW5kbGVyKV0gKE5TRXJyb3IgKmxvYWRFcnJvcikgbXV0YWJsZSB7CisgICAg ICAgIGlmIChsb2FkRXJyb3IpIHsKKyAgICAgICAgICAgIExPRyhNb2RlbEVsZW1lbnQsICJVbmFi bGUgdG8gbG9hZCBmaWxlIGZvciB1dWlkICVzOiAlQC4iLCB1dWlkLnV0ZjgoKS5kYXRhKCksIGxv YWRFcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbik7CisKKyAgICAgICAgICAgIGNhbGxPbk1haW5S dW5Mb29wKFt3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCBoYW5kbGVyID0gV1RGTW92ZSho YW5kbGVyKSwgZXJyb3IgPSBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIHsgbG9hZEVycm9yIH1dICgp IG11dGFibGUgewogICAgICAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgICAgIGhhbmRsZXIoc3RkOjptYWtlX3BhaXIo dXVpZCwgY29udGV4dElkKSk7CisgICAgICAgICAgICAgICAgaGFuZGxlcihlcnJvcik7CiAgICAg ICAgICAgICB9KTsKLSAgICAgICAgfSkuZ2V0KCldOworICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICB9CisKKyAgICAgICAgTE9HKE1vZGVsRWxlbWVudCwgIkxvYWRlZCBmaWxlIHdpdGggVVVJ RCAlcy4iLCB1dWlkLnV0ZjgoKS5kYXRhKCkpOworCisgICAgICAgIGNhbGxPbk1haW5SdW5Mb29w KFt3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVy KV0gKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICAgICAgaGFuZGxlcih7IH0pOworICAgICAgICB9KTsKICAg ICB9KS5nZXQoKV07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL01v ZGVsRWxlbWVudENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL01vZGVsRWxl bWVudENvbnRyb2xsZXIuaAppbmRleCBhY2E0MTZiNmNhOGI2MWY0MDZhMzI5OGI0MjZhZTI2Njcy NzI4NjgxLi5jMWQzMjA1OGU3ZTJhNjQ1MTZkMGQzMjQxNmFhNzFmM2YxOTgwNDg2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Nb2RlbEVsZW1lbnRDb250cm9sbGVyLmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTW9kZWxFbGVtZW50Q29udHJvbGxlci5oCkBAIC03 Myw3ICs3Myw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEludGVyYWN0aW9uRW5hYmxlZEZvck1v ZGVsRWxlbWVudChNb2RlbElkZW50aWZpZXIsIGJvb2wpOwogI2VuZGlmCiAjaWYgRU5BQkxFKEFS S0lUX0lOTElORV9QUkVWSUVXX01BQykKLSAgICB2b2lkIG1vZGVsRWxlbWVudERpZENyZWF0ZVBy ZXZpZXcoVVJMLCBTdHJpbmcsIFdlYkNvcmU6OkZsb2F0U2l6ZSwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChFeHBlY3RlZDxzdGQ6OnBhaXI8U3RyaW5nLCB1aW50MzJfdD4sIFdlYkNvcmU6OlJlc291 cmNlRXJyb3I+KT4mJik7CisgICAgdm9pZCBtb2RlbEVsZW1lbnRDcmVhdGVSZW1vdGVQcmV2aWV3 KFN0cmluZywgV2ViQ29yZTo6RmxvYXRTaXplLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVj dGVkPHN0ZDo6cGFpcjxTdHJpbmcsIHVpbnQzMl90PiwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvcj4p PiYmKTsKKyAgICB2b2lkIG1vZGVsRWxlbWVudExvYWRSZW1vdGVQcmV2aWV3KFN0cmluZywgVVJM LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6UmVzb3VyY2VF cnJvcj4mJik+JiYpOwogICAgIHZvaWQgbW9kZWxFbGVtZW50U2l6ZURpZENoYW5nZShjb25zdCBT dHJpbmcmIHV1aWQsIFdlYkNvcmU6OkZsb2F0U2l6ZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChF eHBlY3RlZDxNYWNoU2VuZFJpZ2h0LCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yPik+JiYpOwogICAg IHZvaWQgaGFuZGxlTW91c2VEb3duRm9yTW9kZWxFbGVtZW50KGNvbnN0IFN0cmluZyYsIGNvbnN0 IFdlYkNvcmU6OkxheW91dFBvaW50JiwgTW9ub3RvbmljVGltZSk7CiAgICAgdm9pZCBoYW5kbGVN b3VzZU1vdmVGb3JNb2RlbEVsZW1lbnQoY29uc3QgU3RyaW5nJiwgY29uc3QgV2ViQ29yZTo6TGF5 b3V0UG9pbnQmLCBNb25vdG9uaWNUaW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IDZmZDEzMmQ3MTczZjViOGM1ODUwZjQxOWU0ZmJhNWUxNzg0NmIzOGUu LmY5NDY1YWY2MGI3ZTYxM2RiMDNhMzdjYzI5ZTMxYjU3MDY5NDQ3MWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMTExMDMsOSArMTExMDMsMTQgQEAgdm9p ZCBXZWJQYWdlUHJveHk6Om1vZGVsRWxlbWVudFNldEludGVyYWN0aW9uRW5hYmxlZChNb2RlbElk ZW50aWZpZXIgbW9kZWxJZGVudGkKICNlbmRpZgogCiAjaWYgRU5BQkxFKEFSS0lUX0lOTElORV9Q UkVWSUVXX01BQykKLXZvaWQgV2ViUGFnZVByb3h5Ojptb2RlbEVsZW1lbnREaWRDcmVhdGVQcmV2 aWV3KGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHV1aWQsIGNvbnN0IEZsb2F0U2l6ZSYg c2l6ZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxzdGQ6OnBhaXI8U3RyaW5nLCB1 aW50MzJfdD4sIFJlc291cmNlRXJyb3I+KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgV2Vi UGFnZVByb3h5Ojptb2RlbEVsZW1lbnRDcmVhdGVSZW1vdGVQcmV2aWV3KGNvbnN0IFN0cmluZyYg dXVpZCwgY29uc3QgRmxvYXRTaXplJiBzaXplLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVj dGVkPHN0ZDo6cGFpcjxTdHJpbmcsIHVpbnQzMl90PiwgUmVzb3VyY2VFcnJvcj4pPiYmIGNvbXBs ZXRpb25IYW5kbGVyKQogewotICAgIG1vZGVsRWxlbWVudENvbnRyb2xsZXIoKS0+bW9kZWxFbGVt ZW50RGlkQ3JlYXRlUHJldmlldyh1cmwsIHV1aWQsIHNpemUsIFdURk1vdmUoY29tcGxldGlvbkhh bmRsZXIpKTsKKyAgICBtb2RlbEVsZW1lbnRDb250cm9sbGVyKCktPm1vZGVsRWxlbWVudENyZWF0 ZVJlbW90ZVByZXZpZXcodXVpZCwgc2l6ZSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor fQorCit2b2lkIFdlYlBhZ2VQcm94eTo6bW9kZWxFbGVtZW50TG9hZFJlbW90ZVByZXZpZXcoY29u c3QgU3RyaW5nJiB1dWlkLCBjb25zdCBVUkwmIHVybCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChz dGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlJlc291cmNlRXJyb3I+JiYpPiYmIGNvbXBsZXRpb25IYW5k bGVyKQoreworICAgIG1vZGVsRWxlbWVudENvbnRyb2xsZXIoKS0+bW9kZWxFbGVtZW50TG9hZFJl bW90ZVByZXZpZXcodXVpZCwgdXJsLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAK IHZvaWQgV2ViUGFnZVByb3h5Ojptb2RlbEVsZW1lbnRTaXplRGlkQ2hhbmdlKGNvbnN0IFN0cmlu ZyYgdXVpZCwgV2ViQ29yZTo6RmxvYXRTaXplIHNpemUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo RXhwZWN0ZWQ8TWFjaFNlbmRSaWdodCwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvcj4pPiYmIGNvbXBs ZXRpb25IYW5kbGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAw NmI3MzdhZTAzYWUyZjNjMWIyY2QzYTI2YjM5YmFjYjFjNGUyNTJkLi5kMmVjZDk3OWViZDA2NjRl MGRlYjg0OTc3MTA1Y2Q4YzQxNzI3NzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaApAQCAtNjEzLDcgKzYxMyw4IEBAIHB1YmxpYzoKICAgICB2b2lkIG1vZGVsRWxlbWVu dFNldEludGVyYWN0aW9uRW5hYmxlZChNb2RlbElkZW50aWZpZXIsIGJvb2wpOwogI2VuZGlmCiAj aWYgRU5BQkxFKEFSS0lUX0lOTElORV9QUkVWSUVXX01BQykKLSAgICB2b2lkIG1vZGVsRWxlbWVu dERpZENyZWF0ZVByZXZpZXcoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgV2ViQ29y ZTo6RmxvYXRTaXplJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxzdGQ6OnBhaXI8 U3RyaW5nLCB1aW50MzJfdD4sIFdlYkNvcmU6OlJlc291cmNlRXJyb3I+KT4mJik7CisgICAgdm9p ZCBtb2RlbEVsZW1lbnRDcmVhdGVSZW1vdGVQcmV2aWV3KGNvbnN0IFN0cmluZyYsIGNvbnN0IFdl YkNvcmU6OkZsb2F0U2l6ZSYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhwZWN0ZWQ8c3RkOjpw YWlyPFN0cmluZywgdWludDMyX3Q+LCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yPik+JiYpOworICAg IHZvaWQgbW9kZWxFbGVtZW50TG9hZFJlbW90ZVByZXZpZXcoY29uc3QgU3RyaW5nJiwgY29uc3Qg VVJMJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlJlc291 cmNlRXJyb3I+JiYpPiYmKTsKICAgICB2b2lkIG1vZGVsRWxlbWVudFNpemVEaWRDaGFuZ2UoY29u c3QgU3RyaW5nJiwgV2ViQ29yZTo6RmxvYXRTaXplLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4 cGVjdGVkPE1hY2hTZW5kUmlnaHQsIFdlYkNvcmU6OlJlc291cmNlRXJyb3I+KT4mJik7CiAgICAg dm9pZCBoYW5kbGVNb3VzZURvd25Gb3JNb2RlbEVsZW1lbnQoY29uc3QgU3RyaW5nJiwgY29uc3Qg V2ViQ29yZTo6TGF5b3V0UG9pbnQmLCBNb25vdG9uaWNUaW1lKTsKICAgICB2b2lkIGhhbmRsZU1v dXNlTW92ZUZvck1vZGVsRWxlbWVudChjb25zdCBTdHJpbmcmLCBjb25zdCBXZWJDb3JlOjpMYXlv dXRQb2ludCYsIE1vbm90b25pY1RpbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDkyYTFjM2NjYjYwNzliMGJiZTI0ZTJmZjkz MzYwMWVkZjM2YWVhMDQuLjhiZDY5NDZhMzAyNjE5NDdlMTIwZmE1YzIzMTAxNzg5NTg5M2MyZmUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMu aW4KQEAgLTU4OSw3ICs1ODksOCBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIE1v ZGVsRWxlbWVudFNldEludGVyYWN0aW9uRW5hYmxlZChzdHJ1Y3QgV2ViS2l0OjpNb2RlbElkZW50 aWZpZXIgbW9kZWxJZGVudGlmaWVyLCBib29sIGlzSW50ZXJhY3Rpb25FbmFibGVkKQogI2VuZGlm CiAjaWYgRU5BQkxFKEFSS0lUX0lOTElORV9QUkVWSUVXX01BQykKLSAgICBNb2RlbEVsZW1lbnRE aWRDcmVhdGVQcmV2aWV3KFVSTCB1cmwsIFN0cmluZyB1dWlkLCBXZWJDb3JlOjpGbG9hdFNpemUg c2l6ZSkgLT4gKEV4cGVjdGVkPHN0ZDo6cGFpcjxTdHJpbmcsIHVpbnQzMl90PiwgV2ViQ29yZTo6 UmVzb3VyY2VFcnJvcj4gcmVzdWx0KQorICAgIE1vZGVsRWxlbWVudENyZWF0ZVJlbW90ZVByZXZp ZXcoU3RyaW5nIHV1aWQsIFdlYkNvcmU6OkZsb2F0U2l6ZSBzaXplKSAtPiAoRXhwZWN0ZWQ8c3Rk OjpwYWlyPFN0cmluZywgdWludDMyX3Q+LCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yPiByZXN1bHQp CisgICAgTW9kZWxFbGVtZW50TG9hZFJlbW90ZVByZXZpZXcoU3RyaW5nIHV1aWQsIFVSTCB1cmwp IC0+IChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlJlc291cmNlRXJyb3I+IGVycm9yKQogICAgIE1v ZGVsRWxlbWVudFNpemVEaWRDaGFuZ2UoU3RyaW5nIHV1aWQsIFdlYkNvcmU6OkZsb2F0U2l6ZSBz aXplKSAtPiAoRXhwZWN0ZWQ8TWFjaFNlbmRSaWdodCwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvcj4g cmVzdWx0KQogICAgIEhhbmRsZU1vdXNlRG93bkZvck1vZGVsRWxlbWVudChTdHJpbmcgdXVpZCwg V2ViQ29yZTo6TGF5b3V0UG9pbnQgZmxpcHBlZExvY2F0aW9uSW5FbGVtZW50LCBNb25vdG9uaWNU aW1lIHRpbWVzdGFtcCkKICAgICBIYW5kbGVNb3VzZU1vdmVGb3JNb2RlbEVsZW1lbnQoU3RyaW5n IHV1aWQsIFdlYkNvcmU6OkxheW91dFBvaW50IGZsaXBwZWRMb2NhdGlvbkluRWxlbWVudCwgTW9u b3RvbmljVGltZSB0aW1lc3RhbXApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTW9kZWwvbWFjL0FSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVyTWFjLmggYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvTW9kZWwvbWFjL0FSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVy TWFjLmgKaW5kZXggYTJlNDM4NGIwY2ZiMjk3ZmY4MTBjZmIzODdkYTUzZjU2ODMwOTE0Ny4uOWVl MDY3MTUyMDg1N2MwMjU0ZGJiZjg5ZTg4OWZmMmJiNjAzODA0YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL01vZGVsL21hYy9BUktpdElubGluZVByZXZpZXdNb2RlbFBsYXll ck1hYy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Nb2RlbC9tYWMvQVJLaXRJbmxp bmVQcmV2aWV3TW9kZWxQbGF5ZXJNYWMuaApAQCAtNjIsNiArNjIsOSBAQCBwcml2YXRlOgogICAg IHZvaWQgY3JlYXRlRmlsZShXZWJDb3JlOjpNb2RlbCYpOwogICAgIHZvaWQgY2xlYXJGaWxlKCk7 CiAKKyAgICB2b2lkIGNyZWF0ZVByZXZpZXdzRm9yTW9kZWxXaXRoVVJMKGNvbnN0IFVSTCYpOwor ICAgIHZvaWQgZGlkQ3JlYXRlUmVtb3RlUHJldmlld0Zvck1vZGVsV2l0aFVSTChjb25zdCBVUkwm KTsKKwogICAgIFdlYkNvcmU6OkxheW91dFNpemUgbV9zaXplOwogICAgIFN0cmluZyBtX2ZpbGVQ YXRoOwogICAgIFJldGFpblB0cjxBU1ZJbmxpbmVQcmV2aWV3PiBtX2lubGluZVByZXZpZXc7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTW9kZWwvbWFjL0FSS2l0SW5saW5l UHJldmlld01vZGVsUGxheWVyTWFjLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL01vZGVs L21hYy9BUktpdElubGluZVByZXZpZXdNb2RlbFBsYXllck1hYy5tbQppbmRleCA0YjdiMzRjZjQz YmE1ZTVkZjliYWYyZTE0OGI0YjgxNGRmZThmMmZkLi4zMThmYWQxYWQ2ZmM1ZWM3MjcwNzMzYWEw ZDk5MjRhYmZkYjhkNjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTW9k ZWwvbWFjL0FSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVyTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9Nb2RlbC9tYWMvQVJLaXRJbmxpbmVQcmV2aWV3TW9kZWxQbGF5ZXJN YWMubW0KQEAgLTE0MCwxMSArMTQwLDI2IEBAIHZvaWQgQVJLaXRJbmxpbmVQcmV2aWV3TW9kZWxQ bGF5ZXJNYWM6OmxvYWQoV2ViQ29yZTo6TW9kZWwmIG1vZGVsU291cmNlLCBXZWJDb3JlCiAgICAg fQogCiAgICAgY3JlYXRlRmlsZShtb2RlbFNvdXJjZSk7CisgICAgY3JlYXRlUHJldmlld3NGb3JN b2RlbFdpdGhVUkwobW9kZWxTb3VyY2UudXJsKCkpOworfQorCit2b2lkIEFSS2l0SW5saW5lUHJl dmlld01vZGVsUGxheWVyTWFjOjpjcmVhdGVQcmV2aWV3c0Zvck1vZGVsV2l0aFVSTChjb25zdCBV UkwmIHVybCkKK3sKKyAgICAvLyBGaXJzdCwgY3JlYXRlIHRoZSBXZWJQcm9jZXNzIHByZXZpZXcu CisgICAgbV9pbmxpbmVQcmV2aWV3ID0gYWRvcHROUyhbYWxsb2NBU1ZJbmxpbmVQcmV2aWV3SW5z dGFuY2UoKSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgbV9zaXplLndpZHRoKCksIG1f c2l6ZS5oZWlnaHQoKSldKTsKKyAgICBMT0coTW9kZWxFbGVtZW50LCAiQVJLaXRJbmxpbmVQcmV2 aWV3TW9kZWxQbGF5ZXJNYWM6OmNyZWF0ZVByZXZpZXdzRm9yTW9kZWxXaXRoVVJMKCkgY3JlYXRl ZCBwcmV2aWV3IHdpdGggVVVJRCAlcyBhbmQgc2l6ZSAlZiB4ICVmLiIsICgoU3RyaW5nKVttX2lu bGluZVByZXZpZXcgdXVpZF0uVVVJRFN0cmluZykudXRmOCgpLmRhdGEoKSwgbV9zaXplLndpZHRo KCksIG1fc2l6ZS5oZWlnaHQoKSk7CiAKLSAgICBtX2lubGluZVByZXZpZXcgPSBhZG9wdE5TKFth bGxvY0FTVklubGluZVByZXZpZXdJbnN0YW5jZSgpIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgw LCAwLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpXSk7Ci0gICAgTE9HKE1vZGVsRWxlbWVu dCwgIkFSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVyOjptb2RlbERpZENoYW5nZSgpIGNyZWF0 ZWQgcHJldmlldyB3aXRoIFVVSUQgJXMgYW5kIHNpemUgJWYgeCAlZi4iLCAoKFN0cmluZylbbV9p bmxpbmVQcmV2aWV3IHV1aWRdLlVVSURTdHJpbmcpLnV0ZjgoKS5kYXRhKCksIHNpemUud2lkdGgo KSwgc2l6ZS5oZWlnaHQoKSk7CisgICAgYXV0byBzdHJvbmdDbGllbnQgPSBjbGllbnQoKTsKKyAg ICBpZiAoIXN0cm9uZ0NsaWVudCkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChFeHBlY3RlZDxzdGQ6OnBhaXI8U3RyaW5nLCB1aW50MzJfdD4sIFdlYkNvcmU6 OlJlc291cmNlRXJyb3I+KT4gY29tcGxldGlvbkhhbmRsZXIgPSBbd2Vha1NlbGYgPSBXZWFrUHRy IHsgKnRoaXMgfV0gKEV4cGVjdGVkPHN0ZDo6cGFpcjxTdHJpbmcsIHVpbnQzMl90PiwgV2ViQ29y ZTo6UmVzb3VyY2VFcnJvcj4gcmVzdWx0KSBtdXRhYmxlIHsKKyAgICBSZWZQdHIgc3Ryb25nUGFn ZSA9IHBhZ2UoKTsKKyAgICBpZiAoIXN0cm9uZ1BhZ2UpIHsKKyAgICAgICAgc3Ryb25nQ2xpZW50 LT5kaWRGYWlsTG9hZGluZygqdGhpcywgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciB7IFdlYkNvcmU6 OmVycm9yRG9tYWluV2ViS2l0SW50ZXJuYWwsIDAsIHVybCwgIldlYlBhZ2UgZGVzdHJveWVkIl9z IH0pOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChFeHBlY3RlZDxzdGQ6OnBhaXI8U3RyaW5nLCB1aW50MzJfdD4sIFdlYkNvcmU6OlJlc291cmNl RXJyb3I+KT4gY29tcGxldGlvbkhhbmRsZXIgPSBbd2Vha1NlbGYgPSBXZWFrUHRyIHsgKnRoaXMg fSwgdXJsXSAoRXhwZWN0ZWQ8c3RkOjpwYWlyPFN0cmluZywgdWludDMyX3Q+LCBXZWJDb3JlOjpS ZXNvdXJjZUVycm9yPiByZXN1bHQpIG11dGFibGUgewogICAgICAgICBSZWZQdHIgc3Ryb25nU2Vs ZiA9IHdlYWtTZWxmLmdldCgpOwogICAgICAgICBpZiAoIXN0cm9uZ1NlbGYpCiAgICAgICAgICAg ICByZXR1cm47CkBAIC0xNTQsNyArMTY5LDcgQEAgdm9pZCBBUktpdElubGluZVByZXZpZXdNb2Rl bFBsYXllck1hYzo6bG9hZChXZWJDb3JlOjpNb2RlbCYgbW9kZWxTb3VyY2UsIFdlYkNvcmUKICAg ICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAoIXJlc3VsdCkgewotICAgICAgICAgICAg TE9HKE1vZGVsRWxlbWVudCwgIkFSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVyOjppbmxpbmVQ cmV2aWV3RGlkT2J0YWluQ29udGV4dElkKCkgcmVjZWl2ZWQgZXJyb3IgZnJvbSBVSVByb2Nlc3Mi KTsKKyAgICAgICAgICAgIExPRyhNb2RlbEVsZW1lbnQsICJBUktpdElubGluZVByZXZpZXdNb2Rl bFBsYXllck1hYzo6Y3JlYXRlUHJldmlld3NGb3JNb2RlbFdpdGhVUkwoKSByZWNlaXZlZCBlcnJv ciBmcm9tIFVJUHJvY2VzcyIpOwogICAgICAgICAgICAgc3Ryb25nQ2xpZW50LT5kaWRGYWlsTG9h ZGluZygqc3Ryb25nU2VsZiwgcmVzdWx0LmVycm9yKCkpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CkBAIC0xNjMsMTggKzE3OCw1NSBAQCB2b2lkIEFSS2l0SW5saW5lUHJldmlld01v ZGVsUGxheWVyTWFjOjpsb2FkKFdlYkNvcmU6Ok1vZGVsJiBtb2RlbFNvdXJjZSwgV2ViQ29yZQog ICAgICAgICBTdHJpbmcgZXhwZWN0ZWRVVUlEID0gW3N0cm9uZ1NlbGYtPm1faW5saW5lUHJldmll dyB1dWlkXS5VVUlEU3RyaW5nOwogCiAgICAgICAgIGlmICh1dWlkICE9IGV4cGVjdGVkVVVJRCkg ewotICAgICAgICAgICAgTE9HKE1vZGVsRWxlbWVudCwgIkFSS2l0SW5saW5lUHJldmlld01vZGVs UGxheWVyOjppbmxpbmVQcmV2aWV3RGlkT2J0YWluQ29udGV4dElkKCkgVVVJRCBtaXNtYXRjaCwg cmVjZWl2ZWQgJXMgYnV0IGV4cGVjdGVkICVzLiIsIHV1aWQudXRmOCgpLmRhdGEoKSwgZXhwZWN0 ZWRVVUlELnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAgICAgc3Ryb25nQ2xpZW50LT5kaWRGYWls TG9hZGluZygqc3Ryb25nU2VsZiwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciB7IFdlYkNvcmU6OmVy cm9yRG9tYWluV2ViS2l0SW50ZXJuYWwsIDAsIHsgfSwgbWFrZVN0cmluZygiQVJLaXRJbmxpbmVQ cmV2aWV3TW9kZWxQbGF5ZXI6OmlubGluZVByZXZpZXdEaWRPYnRhaW5Db250ZXh0SWQoKSBVVUlE IG1pc21hdGNoLCByZWNlaXZlZCAiLCB1dWlkLCAiIGJ1dCBleHBlY3RlZCAiLCBleHBlY3RlZFVV SUQsICIuIikgfSk7CisgICAgICAgICAgICBMT0coTW9kZWxFbGVtZW50LCAiQVJLaXRJbmxpbmVQ cmV2aWV3TW9kZWxQbGF5ZXJNYWM6OmNyZWF0ZVByZXZpZXdzRm9yTW9kZWxXaXRoVVJMKCkgVVVJ RCBtaXNtYXRjaCwgcmVjZWl2ZWQgJXMgYnV0IGV4cGVjdGVkICVzLiIsIHV1aWQudXRmOCgpLmRh dGEoKSwgZXhwZWN0ZWRVVUlELnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgc3Ryb25nQ2xp ZW50LT5kaWRGYWlsTG9hZGluZygqc3Ryb25nU2VsZiwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciB7 IFdlYkNvcmU6OmVycm9yRG9tYWluV2ViS2l0SW50ZXJuYWwsIDAsIHsgfSwgbWFrZVN0cmluZygi QVJLaXRJbmxpbmVQcmV2aWV3TW9kZWxQbGF5ZXI6OmNyZWF0ZVByZXZpZXdzRm9yTW9kZWxXaXRo VVJMKCkgVVVJRCBtaXNtYXRjaCwgcmVjZWl2ZWQgIiwgdXVpZCwgIiBidXQgZXhwZWN0ZWQgIiwg ZXhwZWN0ZWRVVUlELCAiLiIpIH0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAK ICAgICAgICAgW3N0cm9uZ1NlbGYtPm1faW5saW5lUHJldmlldyBzZXRSZW1vdGVDb250ZXh0OmNv bnRleHRJZF07Ci0gICAgICAgIExPRyhNb2RlbEVsZW1lbnQsICJBUktpdElubGluZVByZXZpZXdN b2RlbFBsYXllcjo6aW5saW5lUHJldmlld0RpZE9idGFpbkNvbnRleHRJZCgpIHN1Y2Nlc3NmdWxs eSBlc3RhYmxpc2hlZCByZW1vdGUgY29ubmVjdGlvbiBmb3IgVVVJRCAlcy4iLCB1dWlkLnV0Zjgo KS5kYXRhKCkpOworICAgICAgICBMT0coTW9kZWxFbGVtZW50LCAiQVJLaXRJbmxpbmVQcmV2aWV3 TW9kZWxQbGF5ZXJNYWM6OmNyZWF0ZVByZXZpZXdzRm9yTW9kZWxXaXRoVVJMKCkgc3VjY2Vzc2Z1 bGx5IGVzdGFibGlzaGVkIHJlbW90ZSBjb25uZWN0aW9uIGZvciBVVUlEICVzLiIsIHV1aWQudXRm OCgpLmRhdGEoKSk7CisKKyAgICAgICAgc3Ryb25nU2VsZi0+ZGlkQ3JlYXRlUmVtb3RlUHJldmll d0Zvck1vZGVsV2l0aFVSTCh1cmwpOworICAgIH07CisKKyAgICAvLyBUaGVuLCBjcmVhdGUgdGhl IFVJUHJvY2VzcyBwcmV2aWV3LgorICAgIHN0cm9uZ1BhZ2UtPnNlbmRXaXRoQXN5bmNSZXBseShN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpNb2RlbEVsZW1lbnRDcmVhdGVSZW1vdGVQcmV2aWV3KFtt X2lubGluZVByZXZpZXcgdXVpZF0uVVVJRFN0cmluZywgbV9zaXplKSwgV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcikpOworfQorCit2b2lkIEFSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVyTWFj OjpkaWRDcmVhdGVSZW1vdGVQcmV2aWV3Rm9yTW9kZWxXaXRoVVJMKGNvbnN0IFVSTCYgdXJsKQor eworICAgIGF1dG8gc3Ryb25nQ2xpZW50ID0gY2xpZW50KCk7CisgICAgaWYgKCFzdHJvbmdDbGll bnQpCisgICAgICAgIHJldHVybjsKKworICAgIFJlZlB0ciBzdHJvbmdQYWdlID0gcGFnZSgpOwor ICAgIGlmICghc3Ryb25nUGFnZSkgeworICAgICAgICBzdHJvbmdDbGllbnQtPmRpZEZhaWxMb2Fk aW5nKCp0aGlzLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIHsgV2ViQ29yZTo6ZXJyb3JEb21haW5X ZWJLaXRJbnRlcm5hbCwgMCwgdXJsLCAiV2ViUGFnZSBkZXN0cm95ZWQiX3MgfSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKKyAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKHN0ZDo6b3B0aW9u YWw8V2ViQ29yZTo6UmVzb3VyY2VFcnJvcj4mJik+IGNvbXBsZXRpb25IYW5kbGVyID0gW3dlYWtT ZWxmID0gV2Vha1B0ciB7ICp0aGlzIH1dIChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlJlc291cmNl RXJyb3I+JiYgZXJyb3IpIG11dGFibGUgeworICAgICAgICBSZWZQdHIgc3Ryb25nU2VsZiA9IHdl YWtTZWxmLmdldCgpOworICAgICAgICBpZiAoIXN0cm9uZ1NlbGYpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgYXV0byBzdHJvbmdDbGllbnQgPSBzdHJvbmdTZWxmLT5jbGllbnQoKTsK KyAgICAgICAgaWYgKCFzdHJvbmdDbGllbnQpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgaWYgKGVycm9yKSB7CisgICAgICAgICAgICBMT0coTW9kZWxFbGVtZW50LCAiQVJLaXRJbmxp bmVQcmV2aWV3TW9kZWxQbGF5ZXI6OmRpZENyZWF0ZVJlbW90ZVByZXZpZXdGb3JNb2RlbFdpdGhV UkwoKSByZWNlaXZlZCBlcnJvciBmcm9tIFVJUHJvY2VzcyIpOworICAgICAgICAgICAgc3Ryb25n Q2xpZW50LT5kaWRGYWlsTG9hZGluZygqc3Ryb25nU2VsZiwgKmVycm9yKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIExPRyhNb2RlbEVsZW1lbnQsICJBUktpdElu bGluZVByZXZpZXdNb2RlbFBsYXllcjo6ZGlkQ3JlYXRlUmVtb3RlUHJldmlld0Zvck1vZGVsV2l0 aFVSTCgpIHN1Y2Nlc3NmdWxseSBjb21wbGV0ZWQgbG9hZCBmb3IgVVVJRCAlcy4iLCBbc3Ryb25n U2VsZi0+bV9pbmxpbmVQcmV2aWV3IHV1aWRdKTsKIAogICAgICAgICBzdHJvbmdDbGllbnQtPmRp ZEZpbmlzaExvYWRpbmcoKnN0cm9uZ1NlbGYpOwogICAgIH07Ci0gICAgCi0gICAgc3Ryb25nUGFn ZS0+c2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Ok1vZGVsRWxlbWVu dERpZENyZWF0ZVByZXZpZXcoVVJMOjpmaWxlVVJMV2l0aEZpbGVTeXN0ZW1QYXRoKG1fZmlsZVBh dGgpLCBbbV9pbmxpbmVQcmV2aWV3IHV1aWRdLlVVSURTdHJpbmcsIHNpemUpLCBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7CisKKyAgICAvLyBOb3cgdGhhdCBib3RoIHRoZSBXZWJQcm9jZXNz IGFuZCBVSVByb2Nlc3MgcHJldmlld3MgYXJlIGNyZWF0ZWQsIGxvYWQgdGhlIGZpbGUgaW50byB0 aGUgcmVtb3RlIHByZXZpZXcuCisgICAgc3Ryb25nUGFnZS0+c2VuZFdpdGhBc3luY1JlcGx5KE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6Ok1vZGVsRWxlbWVudExvYWRSZW1vdGVQcmV2aWV3KFttX2lu bGluZVByZXZpZXcgdXVpZF0uVVVJRFN0cmluZywgVVJMOjpmaWxlVVJMV2l0aEZpbGVTeXN0ZW1Q YXRoKG1fZmlsZVBhdGgpKSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCiB2b2lk IEFSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVyTWFjOjpzaXplRGlkQ2hhbmdlKFdlYkNvcmU6 OkxheW91dFNpemUgc2l6ZSkK