213391 2020-06-19 10:48:01 -0700 com.apple.WebKit.Networking crash: suspended with locked system files (observations.db) 2020-06-19 17:02:28 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham cdumez darin wilander oldest_to_newest 1664416 0 katherine_cheney 2020-06-19 10:48:01 -0700 It seems that closing the network process checks for locked system files. NetworkProcess::didClose() kicks off closing of the ITP database, which locks the observations.db file and causes the crash. 1664419 1 katherine_cheney 2020-06-19 10:52:24 -0700 <rdar://problem/64494167> 1664461 2 402307 katherine_cheney 2020-06-19 12:44:41 -0700 Created attachment 402307 Patch 1664516 3 402325 katherine_cheney 2020-06-19 14:23:44 -0700 Created attachment 402325 Patch 1664531 4 402307 darin 2020-06-19 14:45:43 -0700 Comment on attachment 402307 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402307&action=review > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:231 > + flushAndDestroyPersistentStore([callbackAggregator = callbackAggregator.copyRef()] { }); > + destroyResourceLoadStatisticsStore([callbackAggregator = callbackAggregator.copyRef()] { }); copyRef() no longer is necessary, so it can be written like this now, with the same effect: flushAndDestroyPersistentStore([callbackAggregator] { }); destroyResourceLoadStatisticsStore([callbackAggregator] { }); > Source/WebKit/NetworkProcess/NetworkProcess.cpp:270 > + networkSession.flushAndDestroyPersistentStore([callbackAggregator = callbackAggregator.copyRef()] { }); Same here, don’t need copyRef() any more. 1664534 5 cdumez 2020-06-19 14:48:34 -0700 (In reply to Darin Adler from comment #4) > Comment on attachment 402307 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=402307&action=review > > > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:231 > > + flushAndDestroyPersistentStore([callbackAggregator = callbackAggregator.copyRef()] { }); > > + destroyResourceLoadStatisticsStore([callbackAggregator = callbackAggregator.copyRef()] { }); > > copyRef() no longer is necessary, so it can be written like this now, with > the same effect: > > flushAndDestroyPersistentStore([callbackAggregator] { }); > destroyResourceLoadStatisticsStore([callbackAggregator] { }); > > > Source/WebKit/NetworkProcess/NetworkProcess.cpp:270 > > + networkSession.flushAndDestroyPersistentStore([callbackAggregator = callbackAggregator.copyRef()] { }); > > Same here, don’t need copyRef() any more. Any reason we did not drop copyRef() on Ref now that it is copyable? 1664535 6 darin 2020-06-19 14:50:49 -0700 (In reply to Chris Dumez from comment #5) > Any reason we did not drop copyRef() on Ref now that it is copyable? Just haven’t gotten to it yet. It’s marked "deprecated". Someone just has to remove all the calls to copyRef then we can delete it. 1664539 7 402307 katherine_cheney 2020-06-19 14:55:11 -0700 Comment on attachment 402307 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402307&action=review >> Source/WebKit/NetworkProcess/NetworkProcess.cpp:270 >> + networkSession.flushAndDestroyPersistentStore([callbackAggregator = callbackAggregator.copyRef()] { }); > > Same here, don’t need copyRef() any more. Noted! I'll change this for both instances. 1664542 8 402330 katherine_cheney 2020-06-19 14:59:17 -0700 Created attachment 402330 Patch 1664543 9 402325 cdumez 2020-06-19 14:59:31 -0700 Comment on attachment 402325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402325&action=review > Source/WebKit/ChangeLog:10 > + NetworkProcess::didClose() is called. This causes the network process When does NetworkProcess::didClose() get called? Isn't it when the UIProcess process has quit? 1664547 10 402325 katherine_cheney 2020-06-19 15:01:06 -0700 Comment on attachment 402325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402325&action=review >> Source/WebKit/ChangeLog:10 >> + NetworkProcess::didClose() is called. This causes the network process > > When does NetworkProcess::didClose() get called? Isn't it when the UIProcess process has quit? Yes, I believe so. Local storage DB does not close when this happens, I don't think ITP should either if the network session hasn't been destroyed. 1664551 11 402330 cdumez 2020-06-19 15:10:53 -0700 Comment on attachment 402330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402330&action=review > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:255 > + m_statisticsQueue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] () mutable { postTask() ? > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:257 > + RunLoop::main().dispatch(WTFMove(completionHandler)); postTaskReply() ? 1664556 12 402330 katherine_cheney 2020-06-19 15:15:25 -0700 Comment on attachment 402330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402330&action=review >> Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:255 >> + m_statisticsQueue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] () mutable { > > postTask() ? Will change! >> Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:257 >> + RunLoop::main().dispatch(WTFMove(completionHandler)); > > postTaskReply() ? Ditto 1664561 13 402334 katherine_cheney 2020-06-19 15:23:12 -0700 Created attachment 402334 Patch for landing 1664601 14 402344 katherine_cheney 2020-06-19 16:36:57 -0700 Created attachment 402344 Patch for landing 1664602 15 katherine_cheney 2020-06-19 16:37:36 -0700 postTask ASSERTS to check for Ephemeral sessions, I added an early return for the ephemeral case. 1664620 16 ews-feeder 2020-06-19 17:02:27 -0700 Committed r263298: <https://trac.webkit.org/changeset/263298> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402344. 402307 2020-06-19 12:44:41 -0700 2020-06-19 14:59:14 -0700 Patch bug-213391-20200619124440.patch text/plain 8154 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlNWEzYjRhNmU5MDRmNDRm NmU1ZGNmMThlOWU2MmRhZmE2YTJhMGIuLjhiNTY2NzhiMTczMjM0N2RkZjhkYmI3Mjk5NGE5NzYy ZmYzMzQ1MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjAtMDYtMTkgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgY29tLmFwcGxlLldl YktpdC5OZXR3b3JraW5nIGNyYXNoOiBzdXNwZW5kZWQgd2l0aCBsb2NrZWQgc3lzdGVtIGZpbGVz IChvYnNlcnZhdGlvbnMuZGIpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTMzOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NDk0MTY3PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElUUCBpcyB0aGUg b25seSBkYXRhYmFzZSB0aGF0IGF0dGVtcHRzIHRvIGNsb3NlIHdoZW4KKyAgICAgICAgTmV0d29y a1Byb2Nlc3M6OmRpZENsb3NlKCkgaXMgY2FsbGVkLiBUaGlzIGNhdXNlcyB0aGUgbmV0d29yayBw cm9jZXNzCisgICAgICAgIHRvIHNvbWV0aW1lcyBjcmFzaCBpZiB0aGUgZGF0YWJhc2UgaXMgc3Rp bGwgY2xvc2luZyB3aGVuIGNoZWNraW5nIGZvcgorICAgICAgICBsb2NrZWQgc3lzdGVtIGZpbGVz LiBJbnN0ZWFkLCB3ZSBzaG91bGQgb25seSBmbHVzaCB0aGUKKyAgICAgICAgbWVtb3J5IHN0b3Jl IHRvIGRpc2sgd2hlbiBjYWxsaW5nIE5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSAoaW4gdGhlCisg ICAgICAgIG1lbW9yeSBzdG9yZSBjYXNlKSwgYW5kIG9ubHkgY2xvc2UgdGhlIGRhdGFiYXNlIHdo ZW4gdGhlIG5ldHdvcmsgc2Vzc2lvbiBpcyBkZXN0cm95ZWQuIAorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRpZERlc3Ry b3lOZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6ZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Zmx1c2hBbmREZXN0cm95 UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICBTcGxpdCBpbnRvIHR3byBm dW5jdGlvbnMsIG9uZSB0byBmbHVzaCBhbmQgZGVzdHJveSB0aGUgcGVyc2lzdGVudAorICAgICAg ICBzdG9yZSwgYW5kIG9uZSB0byBkZXN0cm95IHRoZSBtZW1vcnkgb3IgZGF0YWJhc2Ugc3RvcmUu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSk6CisgICAgICAgIE9ubHkgZmx1c2gg dGhlIHBlcnNpc3RlbnQgc3RvcmUgaGVyZSwgYXMgZGVzY3JpYmVkIGFib3ZlLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrU2Vzc2lvbjo6Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDIwLTA2LTE3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVmZXJlbmNlcyB0byBi bGFja2xpc3Qvd2hpdGVsaXN0IGluIHRoZSBvbGQgQyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZGE2N2MwZjdlZjVkNzRiMDUwZDM1 ZjQ2NjliMzlhZmExMjc4NGJmMC4uMjQ4MmNmMmUyYTQwNjFmOGFhODc5Mzc4MzcyMDU5ZmY2MWY4 ZDVkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAKQEAgLTIyMiw4ICsyMjIsMTMgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OmRpZERlc3Ryb3lOZXR3b3JrU2Vzc2lvbihDb21wbGV0aW9uSGFuZGxlcjwKIHsKICAgICBB U1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCisgICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3Ig PSBDYWxsYmFja0FnZ3JlZ2F0b3I6OmNyZWF0ZShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CisgICAgICAgIHBvc3RUYXNrUmVwbHko V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIH0pOworCiAgICAgbV9uZXR3b3JrU2Vz c2lvbiA9IG51bGxwdHI7Ci0gICAgZmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3Rv cmUoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsg fSk7CisgICAgZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZShbY2FsbGJhY2tBZ2dy ZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9KTsKIH0KIAogaW5saW5l IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwb3N0VGFzayhXVEY6OkZ1bmN0 aW9uPHZvaWQoKT4mJiB0YXNrKQpAQCAtMjQzLDYgKzI0OCwxNiBAQCBpbmxpbmUgdm9pZCBXZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnBvc3RUYXNrUmVwbHkoV1RGOjpGdW5jdGlvbjx2 b2lkKCk+JgogICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChXVEZNb3ZlKHJlcGx5KSk7CiB9 CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpkZXN0cm95UmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9u SGFuZGxlcikKK3sKKyAgICBSRUxFQVNFX0FTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisKKyAg ICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KV0gKCkgbXV0YWJsZSB7CisgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlID0gbnVsbHB0cjsKKyAg ICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp KTsKKyAgICB9KTsKK30KKwogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZs dXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoUnVuTG9vcDo6aXNNYWlu KCkpOwpAQCAtMjUxLDcgKzI2Niw2IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoQ29tcGxldGlvbkhhCiAgICAgLy8g aXMgZGVzdHJveWVkIGJlY2F1c2UgaXQgaGFzIGEgQysrIHJlZmVyZW5jZSB0byB1cy4KICAgICBt X3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0g KCkgbXV0YWJsZSB7CiAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UgPSBudWxscHRyOwotICAg ICAgICBtX3N0YXRpc3RpY3NTdG9yZSA9IG51bGxwdHI7CiAgICAgICAgIFJ1bkxvb3A6Om1haW4o KS5kaXNwYXRjaChXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiAgICAgfSk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKaW5kZXggMzg5N2Q1MWFh OTgxOWNhYzU2ODNmZjA3YTQ3M2VjODI1MWFlYmM3OC4uYjE3MDQ2YzhkMjA0YzU5ODA5NDc2NzEx NDczMTU4ZDkxZmExY2IxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuaApAQCAtMjk5LDYgKzI5OSw3IEBAIHN0cnVjdCBUaGlyZFBhcnR5RGF0YSB7CiAg ICAgCiAgICAgYm9vbCBpc0VwaGVtZXJhbCgpIGNvbnN0IHsgcmV0dXJuIG1faXNFcGhlbWVyYWwg PT0gV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljczo6SXNFcGhlbWVyYWw6OlllczsgfTsK ICAgICB2b2lkIGluc2VydEV4cGlyZWRTdGF0aXN0aWNGb3JUZXN0aW5nKGNvbnN0IFJlZ2lzdHJh YmxlRG9tYWluJiwgYm9vbCBoYWRVc2VySW50ZXJhY3Rpb24sIGJvb2wgaXNTY2hlZHVsZWRGb3JB bGxCdXRDb29raWVEYXRhUmVtb3ZhbCwgYm9vbCBpc1ByZXZhbGVudCwgQ29tcGxldGlvbkhhbmRs ZXI8dm9pZCgpPiYmKTsKKyAgICB2b2lkIGZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShD b21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFdl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZShOZXR3b3JrU2Vzc2lvbiYsIGNvbnN0IFN0cmlu ZyYsIFNob3VsZEluY2x1ZGVMb2NhbGhvc3QsIFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3Rp Y3M6OklzRXBoZW1lcmFsKTsKQEAgLTMxOSw3ICszMjAsNyBAQCBwcml2YXRlOgogCiAgICAgU3Rv cmFnZUFjY2Vzc1N0YXR1cyBzdG9yYWdlQWNjZXNzU3RhdHVzKGNvbnN0IFN0cmluZyYgc3ViRnJh bWVQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHRvcEZyYW1lUHJpbWFyeURvbWFpbik7CiAK LSAgICB2b2lkIGZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGFuZGxl cjx2b2lkKCk+JiYpOworICAgIHZvaWQgZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogCiAgICAgV2Vha1B0cjxOZXR3b3JrU2Vz c2lvbj4gbV9uZXR3b3JrU2Vzc2lvbjsKICAgICBSZWY8V1RGOjpXb3JrUXVldWU+IG1fc3RhdGlz dGljc1F1ZXVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmNwcAppbmRleCBlNjEzNWM2MmMxY2NjMDBkZDJjZjA1ZDJhN2Q0MTU5MWIzMGU3NjNiLi4z Njc2MjI0N2QzOTM1YjIxM2Q4NjY3YjY1M2QyMzVlMTUwMTNkMzQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcApAQCAtMjY3LDcgKzI2Nyw3 IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRpZENsb3NlKElQQzo6Q29ubmVjdGlvbiYpCiAgICAg Ly8gTWFrZSBzdXJlIHdlIGZsdXNoIGFsbCBjb29raWVzIGFuZCByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MgdG8gZGlzayBiZWZvcmUgZXhpdGluZy4KICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9T VEFUSVNUSUNTKQogICAgIGZvckVhY2hOZXR3b3JrU2Vzc2lvbihbJl0gKGF1dG8mIG5ldHdvcmtT ZXNzaW9uKSB7Ci0gICAgICAgIG5ldHdvcmtTZXNzaW9uLmRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzKFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0FnZ3JlZ2F0b3IuY29weVJlZigp XSB7IH0pOworICAgICAgICBuZXR3b3JrU2Vzc2lvbi5mbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50 U3RvcmUoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCld IHsgfSk7CiAgICAgfSk7CiAjZW5kaWYKICAgICBwbGF0Zm9ybVN5bmNBbGxDb29raWVzKFtjYWxs YmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAppbmRleCA0 NmZmYmQ0MzIxNTJiZjllNDhhYzUxMTVjZmY4YWZhNjM3MTYzMDYwLi42YjY2YmNmMjIyMGMzNWJh ZWE2ZDJiYjU4ZTEzMDE4OGQxNjY2OGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcApAQCAtMTQ4LDYgKzE0OCwxNCBAQCB2b2lkIE5ldHdv cmtTZXNzaW9uOjpkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljcyhDb21wbGV0aW9uSGFuZGxl cjx2b2lkKCk+JiYgYwogICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+ZGlkRGVzdHJveU5l dHdvcmtTZXNzaW9uKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICBtX3Jlc291cmNl TG9hZFN0YXRpc3RpY3MgPSBudWxscHRyOwogfQorCit2b2lkIE5ldHdvcmtTZXNzaW9uOjpmbHVz aEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNv bXBsZXRpb25IYW5kbGVyKQoreworICAgIGlmICghbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKQor ICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoKTsKKworICAgIG1fcmVzb3VyY2VMb2Fk U3RhdGlzdGljcy0+Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKTsKK30KICNlbmRpZgogCiB2b2lkIE5ldHdvcmtTZXNzaW9uOjppbnZhbGlk YXRlQW5kQ2FuY2VsKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nl c3Npb24uaAppbmRleCBkOGQzZWNiYWQ4ZTY4ODUwNmE4ODU2NDA4OTE4NDhhMmJhMDZlNDNhLi5m MzIyMDMyMTNiZmI5MDU5MjQ2YmM0NGYxMzFiOTQxOTYyYjkyZGVkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCkBAIC0xMDYsNiArMTA2LDcgQEAg cHVibGljOgogICAgIHZvaWQgc2V0VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZShXZWJDb3Jl OjpUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKTsKICAgICB2b2lkIHNldFNob3VsZEVuYmxl U2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVudChXZWJDb3JlOjpTYW1lU2l0ZVN0cmljdEVuZm9yY2Vt ZW50RW5hYmxlZCk7CiAgICAgdm9pZCBkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljcyhDb21w bGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAgIHZvaWQgZmx1c2hBbmREZXN0cm95UGVyc2lz dGVudFN0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAjZW5kaWYKICAgICAKICAg ICB2aXJ0dWFsIGJvb2wgaGFzQXBwQm91bmRTZXNzaW9uKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0K 402325 2020-06-19 14:23:44 -0700 2020-06-19 15:23:08 -0700 Patch bug-213391-20200619142343.patch text/plain 8132 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlNWEzYjRhNmU5MDRmNDRm NmU1ZGNmMThlOWU2MmRhZmE2YTJhMGIuLjhiNTY2NzhiMTczMjM0N2RkZjhkYmI3Mjk5NGE5NzYy ZmYzMzQ1MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjAtMDYtMTkgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgY29tLmFwcGxlLldl YktpdC5OZXR3b3JraW5nIGNyYXNoOiBzdXNwZW5kZWQgd2l0aCBsb2NrZWQgc3lzdGVtIGZpbGVz IChvYnNlcnZhdGlvbnMuZGIpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTMzOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NDk0MTY3PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElUUCBpcyB0aGUg b25seSBkYXRhYmFzZSB0aGF0IGF0dGVtcHRzIHRvIGNsb3NlIHdoZW4KKyAgICAgICAgTmV0d29y a1Byb2Nlc3M6OmRpZENsb3NlKCkgaXMgY2FsbGVkLiBUaGlzIGNhdXNlcyB0aGUgbmV0d29yayBw cm9jZXNzCisgICAgICAgIHRvIHNvbWV0aW1lcyBjcmFzaCBpZiB0aGUgZGF0YWJhc2UgaXMgc3Rp bGwgY2xvc2luZyB3aGVuIGNoZWNraW5nIGZvcgorICAgICAgICBsb2NrZWQgc3lzdGVtIGZpbGVz LiBJbnN0ZWFkLCB3ZSBzaG91bGQgb25seSBmbHVzaCB0aGUKKyAgICAgICAgbWVtb3J5IHN0b3Jl IHRvIGRpc2sgd2hlbiBjYWxsaW5nIE5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSAoaW4gdGhlCisg ICAgICAgIG1lbW9yeSBzdG9yZSBjYXNlKSwgYW5kIG9ubHkgY2xvc2UgdGhlIGRhdGFiYXNlIHdo ZW4gdGhlIG5ldHdvcmsgc2Vzc2lvbiBpcyBkZXN0cm95ZWQuIAorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRpZERlc3Ry b3lOZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6ZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Zmx1c2hBbmREZXN0cm95 UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICBTcGxpdCBpbnRvIHR3byBm dW5jdGlvbnMsIG9uZSB0byBmbHVzaCBhbmQgZGVzdHJveSB0aGUgcGVyc2lzdGVudAorICAgICAg ICBzdG9yZSwgYW5kIG9uZSB0byBkZXN0cm95IHRoZSBtZW1vcnkgb3IgZGF0YWJhc2Ugc3RvcmUu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSk6CisgICAgICAgIE9ubHkgZmx1c2gg dGhlIHBlcnNpc3RlbnQgc3RvcmUgaGVyZSwgYXMgZGVzY3JpYmVkIGFib3ZlLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrU2Vzc2lvbjo6Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDIwLTA2LTE3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVmZXJlbmNlcyB0byBi bGFja2xpc3Qvd2hpdGVsaXN0IGluIHRoZSBvbGQgQyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZGE2N2MwZjdlZjVkNzRiMDUwZDM1 ZjQ2NjliMzlhZmExMjc4NGJmMC4uYjljMGRlYWViNWZlMDAxZDJlZTk3MTJiM2VkYmZkYjZjNWIy Nzg0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAKQEAgLTIyMiw4ICsyMjIsMTMgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OmRpZERlc3Ryb3lOZXR3b3JrU2Vzc2lvbihDb21wbGV0aW9uSGFuZGxlcjwKIHsKICAgICBB U1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCisgICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3Ig PSBDYWxsYmFja0FnZ3JlZ2F0b3I6OmNyZWF0ZShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKCk7CisgICAgfSk7CisKICAgICBtX25ldHdvcmtTZXNzaW9uID0gbnVsbHB0cjsKLSAgICBm bHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikp OworICAgIGZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShbY2FsbGJhY2tBZ2dyZWdhdG9y ID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9KTsKKyAgICBkZXN0cm95UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlKFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0FnZ3Jl Z2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiBpbmxpbmUgdm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OnBvc3RUYXNrKFdURjo6RnVuY3Rpb248dm9pZCgpPiYmIHRhc2spCkBA IC0yNDMsNiArMjQ4LDE2IEBAIGlubGluZSB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6cG9zdFRhc2tSZXBseShXVEY6OkZ1bmN0aW9uPHZvaWQoKT4mCiAgICAgUnVuTG9vcDo6 bWFpbigpLmRpc3BhdGNoKFdURk1vdmUocmVwbHkpKTsKIH0KIAordm9pZCBXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6OmRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUoQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIFJFTEVB U0VfQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKworICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5k aXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9u SGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoKSBtdXRhYmxlIHsKKyAgICAg ICAgbV9zdGF0aXN0aWNzU3RvcmUgPSBudWxscHRyOworICAgICAgICBSdW5Mb29wOjptYWluKCku ZGlzcGF0Y2goV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIH0pOworfQorCiB2b2lk IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVu dFN0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsK ICAgICBSRUxFQVNFX0FTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CkBAIC0yNTEsNyArMjY2LDYg QEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZsdXNoQW5kRGVzdHJveVBl cnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGEKICAgICAvLyBpcyBkZXN0cm95ZWQgYmVjYXVzZSBp dCBoYXMgYSBDKysgcmVmZXJlbmNlIHRvIHVzLgogICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNw YXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFu ZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoKSBtdXRhYmxlIHsKICAgICAgICAg bV9wZXJzaXN0ZW50U3RvcmFnZSA9IG51bGxwdHI7Ci0gICAgICAgIG1fc3RhdGlzdGljc1N0b3Jl ID0gbnVsbHB0cjsKICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpKTsKICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCAzODk3ZDUxYWE5ODE5Y2FjNTY4M2ZmMDdhNDczZWM4 MjUxYWViYzc4Li5iMTcwNDZjOGQyMDRjNTk4MDk0NzY3MTE0NzMxNThkOTFmYTFjYjE1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC0yOTksNiAr Mjk5LDcgQEAgc3RydWN0IFRoaXJkUGFydHlEYXRhIHsKICAgICAKICAgICBib29sIGlzRXBoZW1l cmFsKCkgY29uc3QgeyByZXR1cm4gbV9pc0VwaGVtZXJhbCA9PSBXZWJDb3JlOjpSZXNvdXJjZUxv YWRTdGF0aXN0aWNzOjpJc0VwaGVtZXJhbDo6WWVzOyB9OwogICAgIHZvaWQgaW5zZXJ0RXhwaXJl ZFN0YXRpc3RpY0ZvclRlc3RpbmcoY29uc3QgUmVnaXN0cmFibGVEb21haW4mLCBib29sIGhhZFVz ZXJJbnRlcmFjdGlvbiwgYm9vbCBpc1NjaGVkdWxlZEZvckFsbEJ1dENvb2tpZURhdGFSZW1vdmFs LCBib29sIGlzUHJldmFsZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAgIHZv aWQgZmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQo KT4mJik7CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlKE5ldHdvcmtTZXNzaW9uJiwgY29uc3QgU3RyaW5nJiwgU2hvdWxkSW5jbHVkZUxvY2Fs aG9zdCwgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljczo6SXNFcGhlbWVyYWwpOwpAQCAt MzE5LDcgKzMyMCw3IEBAIHByaXZhdGU6CiAKICAgICBTdG9yYWdlQWNjZXNzU3RhdHVzIHN0b3Jh Z2VBY2Nlc3NTdGF0dXMoY29uc3QgU3RyaW5nJiBzdWJGcmFtZVByaW1hcnlEb21haW4sIGNvbnN0 IFN0cmluZyYgdG9wRnJhbWVQcmltYXJ5RG9tYWluKTsKIAotICAgIHZvaWQgZmx1c2hBbmREZXN0 cm95UGVyc2lzdGVudFN0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CisgICAgdm9p ZCBkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZv aWQoKT4mJik7CiAKICAgICBXZWFrUHRyPE5ldHdvcmtTZXNzaW9uPiBtX25ldHdvcmtTZXNzaW9u OwogICAgIFJlZjxXVEY6OldvcmtRdWV1ZT4gbV9zdGF0aXN0aWNzUXVldWU7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IGU2MTM1YzYy YzFjY2MwMGRkMmNmMDVkMmE3ZDQxNTkxYjMwZTc2M2IuLjM2NzYyMjQ3ZDM5MzViMjEzZDg2Njdi NjUzZDIzNWUxNTAxM2QzNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0yNjcsNyArMjY3LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vz czo6ZGlkQ2xvc2UoSVBDOjpDb25uZWN0aW9uJikKICAgICAvLyBNYWtlIHN1cmUgd2UgZmx1c2gg YWxsIGNvb2tpZXMgYW5kIHJlc291cmNlIGxvYWQgc3RhdGlzdGljcyB0byBkaXNrIGJlZm9yZSBl eGl0aW5nLgogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgZm9yRWFj aE5ldHdvcmtTZXNzaW9uKFsmXSAoYXV0byYgbmV0d29ya1Nlc3Npb24pIHsKLSAgICAgICAgbmV0 d29ya1Nlc3Npb24uZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3MoW2NhbGxiYWNrQWdncmVn YXRvciA9IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgICAgIG5ldHdv cmtTZXNzaW9uLmZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShbY2FsbGJhY2tBZ2dyZWdh dG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9KTsKICAgICB9KTsKICNlbmRp ZgogICAgIHBsYXRmb3JtU3luY0FsbENvb2tpZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxi YWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCmluZGV4IDQ2ZmZiZDQzMjE1MmJmOWU0OGFjNTEx NWNmZjhhZmE2MzcxNjMwNjAuLjZiNjZiY2YyMjIwYzM1YmFlYTZkMmJiNThlMTMwMTg4ZDE2NjY4 YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Np b24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24u Y3BwCkBAIC0xNDgsNiArMTQ4LDE0IEBAIHZvaWQgTmV0d29ya1Nlc3Npb246OmRlc3Ryb3lSZXNv dXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjCiAgICAgbV9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5kaWREZXN0cm95TmV0d29ya1Nlc3Npb24oV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOwogICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG51bGxw dHI7CiB9CisKK3ZvaWQgTmV0d29ya1Nlc3Npb246OmZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRT dG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7Cisg ICAgaWYgKCFtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MpCisgICAgICAgIHJldHVybiBjb21wbGV0 aW9uSGFuZGxlcigpOworCisgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5mbHVzaEFuZERl c3Ryb3lQZXJzaXN0ZW50U3RvcmUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworfQogI2Vu ZGlmCiAKIHZvaWQgTmV0d29ya1Nlc3Npb246OmludmFsaWRhdGVBbmRDYW5jZWwoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCmluZGV4IGQ4ZDNlY2Jh ZDhlNjg4NTA2YTg4NTY0MDg5MTg0OGEyYmEwNmU0M2EuLmYzMjIwMzIxM2JmYjkwNTkyNDZiYzQ0 ZjEzMWI5NDE5NjJiOTJkZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtTZXNzaW9uLmgKQEAgLTEwNiw2ICsxMDYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRU aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKFdlYkNvcmU6OlRoaXJkUGFydHlDb29raWVCbG9j a2luZ01vZGUpOwogICAgIHZvaWQgc2V0U2hvdWxkRW5ibGVTYW1lU2l0ZVN0cmljdEVuZm9yY2Vt ZW50KFdlYkNvcmU6OlNhbWVTaXRlU3RyaWN0RW5mb3JjZW1lbnRFbmFibGVkKTsKICAgICB2b2lk IGRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m Jik7CisgICAgdm9pZCBmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoQ29tcGxldGlvbkhh bmRsZXI8dm9pZCgpPiYmKTsKICNlbmRpZgogICAgIAogICAgIHZpcnR1YWwgYm9vbCBoYXNBcHBC b3VuZFNlc3Npb24oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQo= 402330 2020-06-19 14:59:17 -0700 2020-06-19 15:23:10 -0700 Patch bug-213391-20200619145916.patch text/plain 8070 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlNWEzYjRhNmU5MDRmNDRm NmU1ZGNmMThlOWU2MmRhZmE2YTJhMGIuLjhiNTY2NzhiMTczMjM0N2RkZjhkYmI3Mjk5NGE5NzYy ZmYzMzQ1MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjAtMDYtMTkgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgY29tLmFwcGxlLldl YktpdC5OZXR3b3JraW5nIGNyYXNoOiBzdXNwZW5kZWQgd2l0aCBsb2NrZWQgc3lzdGVtIGZpbGVz IChvYnNlcnZhdGlvbnMuZGIpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTMzOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NDk0MTY3PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElUUCBpcyB0aGUg b25seSBkYXRhYmFzZSB0aGF0IGF0dGVtcHRzIHRvIGNsb3NlIHdoZW4KKyAgICAgICAgTmV0d29y a1Byb2Nlc3M6OmRpZENsb3NlKCkgaXMgY2FsbGVkLiBUaGlzIGNhdXNlcyB0aGUgbmV0d29yayBw cm9jZXNzCisgICAgICAgIHRvIHNvbWV0aW1lcyBjcmFzaCBpZiB0aGUgZGF0YWJhc2UgaXMgc3Rp bGwgY2xvc2luZyB3aGVuIGNoZWNraW5nIGZvcgorICAgICAgICBsb2NrZWQgc3lzdGVtIGZpbGVz LiBJbnN0ZWFkLCB3ZSBzaG91bGQgb25seSBmbHVzaCB0aGUKKyAgICAgICAgbWVtb3J5IHN0b3Jl IHRvIGRpc2sgd2hlbiBjYWxsaW5nIE5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSAoaW4gdGhlCisg ICAgICAgIG1lbW9yeSBzdG9yZSBjYXNlKSwgYW5kIG9ubHkgY2xvc2UgdGhlIGRhdGFiYXNlIHdo ZW4gdGhlIG5ldHdvcmsgc2Vzc2lvbiBpcyBkZXN0cm95ZWQuIAorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRpZERlc3Ry b3lOZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6ZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Zmx1c2hBbmREZXN0cm95 UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICBTcGxpdCBpbnRvIHR3byBm dW5jdGlvbnMsIG9uZSB0byBmbHVzaCBhbmQgZGVzdHJveSB0aGUgcGVyc2lzdGVudAorICAgICAg ICBzdG9yZSwgYW5kIG9uZSB0byBkZXN0cm95IHRoZSBtZW1vcnkgb3IgZGF0YWJhc2Ugc3RvcmUu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSk6CisgICAgICAgIE9ubHkgZmx1c2gg dGhlIHBlcnNpc3RlbnQgc3RvcmUgaGVyZSwgYXMgZGVzY3JpYmVkIGFib3ZlLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrU2Vzc2lvbjo6Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDIwLTA2LTE3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVmZXJlbmNlcyB0byBi bGFja2xpc3Qvd2hpdGVsaXN0IGluIHRoZSBvbGQgQyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZGE2N2MwZjdlZjVkNzRiMDUwZDM1 ZjQ2NjliMzlhZmExMjc4NGJmMC4uYTljMDBhZDUyNWFmNzhiN2U2OTM2YTBhNTAzYWZkYWEwYzlj YzJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAKQEAgLTIyMiw4ICsyMjIsMTMgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OmRpZERlc3Ryb3lOZXR3b3JrU2Vzc2lvbihDb21wbGV0aW9uSGFuZGxlcjwKIHsKICAgICBB U1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCisgICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3Ig PSBDYWxsYmFja0FnZ3JlZ2F0b3I6OmNyZWF0ZShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKCk7CisgICAgfSk7CisKICAgICBtX25ldHdvcmtTZXNzaW9uID0gbnVsbHB0cjsKLSAgICBm bHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikp OworICAgIGZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShbY2FsbGJhY2tBZ2dyZWdhdG9y XSB7IH0pOworICAgIGRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUoW2NhbGxiYWNr QWdncmVnYXRvcl0geyB9KTsKIH0KIAogaW5saW5lIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpwb3N0VGFzayhXVEY6OkZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQpAQCAtMjQz LDYgKzI0OCwxNiBAQCBpbmxpbmUgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnBvc3RUYXNrUmVwbHkoV1RGOjpGdW5jdGlvbjx2b2lkKCk+JgogICAgIFJ1bkxvb3A6Om1haW4o KS5kaXNwYXRjaChXVEZNb3ZlKHJlcGx5KSk7CiB9CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKENvbXBsZXRp b25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBSRUxFQVNFX0FT U0VSVChSdW5Mb29wOjppc01haW4oKSk7CisKKyAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0 Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CisgICAgICAgIG1f c3RhdGlzdGljc1N0b3JlID0gbnVsbHB0cjsKKyAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3Bh dGNoKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICB9KTsKK30KKwogdm9pZCBXZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9y ZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAg UkVMRUFTRV9BU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwpAQCAtMjUxLDcgKzI2Niw2IEBAIHZv aWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpmbHVzaEFuZERlc3Ryb3lQZXJzaXN0 ZW50U3RvcmUoQ29tcGxldGlvbkhhCiAgICAgLy8gaXMgZGVzdHJveWVkIGJlY2F1c2UgaXQgaGFz IGEgQysrIHJlZmVyZW5jZSB0byB1cy4KICAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2go W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgIG1fcGVy c2lzdGVudFN0b3JhZ2UgPSBudWxscHRyOwotICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZSA9IG51 bGxwdHI7CiAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKSk7CiAgICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmgKaW5kZXggMzg5N2Q1MWFhOTgxOWNhYzU2ODNmZjA3YTQ3M2VjODI1MWFl YmM3OC4uYjE3MDQ2YzhkMjA0YzU5ODA5NDc2NzExNDczMTU4ZDkxZmExY2IxNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xh c3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaApAQCAtMjk5LDYgKzI5OSw3 IEBAIHN0cnVjdCBUaGlyZFBhcnR5RGF0YSB7CiAgICAgCiAgICAgYm9vbCBpc0VwaGVtZXJhbCgp IGNvbnN0IHsgcmV0dXJuIG1faXNFcGhlbWVyYWwgPT0gV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3Rh dGlzdGljczo6SXNFcGhlbWVyYWw6OlllczsgfTsKICAgICB2b2lkIGluc2VydEV4cGlyZWRTdGF0 aXN0aWNGb3JUZXN0aW5nKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiwgYm9vbCBoYWRVc2VySW50 ZXJhY3Rpb24sIGJvb2wgaXNTY2hlZHVsZWRGb3JBbGxCdXRDb29raWVEYXRhUmVtb3ZhbCwgYm9v bCBpc1ByZXZhbGVudCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKKyAgICB2b2lkIGZs dXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYp OwogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZShOZXR3b3JrU2Vzc2lvbiYsIGNvbnN0IFN0cmluZyYsIFNob3VsZEluY2x1ZGVMb2NhbGhvc3Qs IFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M6OklzRXBoZW1lcmFsKTsKQEAgLTMxOSw3 ICszMjAsNyBAQCBwcml2YXRlOgogCiAgICAgU3RvcmFnZUFjY2Vzc1N0YXR1cyBzdG9yYWdlQWNj ZXNzU3RhdHVzKGNvbnN0IFN0cmluZyYgc3ViRnJhbWVQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJp bmcmIHRvcEZyYW1lUHJpbWFyeURvbWFpbik7CiAKLSAgICB2b2lkIGZsdXNoQW5kRGVzdHJveVBl cnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAgIHZvaWQgZGVz dHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYpOwogCiAgICAgV2Vha1B0cjxOZXR3b3JrU2Vzc2lvbj4gbV9uZXR3b3JrU2Vzc2lvbjsKICAg ICBSZWY8V1RGOjpXb3JrUXVldWU+IG1fc3RhdGlzdGljc1F1ZXVlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCBlNjEzNWM2MmMxY2Nj MDBkZDJjZjA1ZDJhN2Q0MTU5MWIzMGU3NjNiLi4zNjc2MjI0N2QzOTM1YjIxM2Q4NjY3YjY1M2Qy MzVlMTUwMTNkMzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtQcm9jZXNzLmNwcApAQCAtMjY3LDcgKzI2Nyw3IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRp ZENsb3NlKElQQzo6Q29ubmVjdGlvbiYpCiAgICAgLy8gTWFrZSBzdXJlIHdlIGZsdXNoIGFsbCBj b29raWVzIGFuZCByZXNvdXJjZSBsb2FkIHN0YXRpc3RpY3MgdG8gZGlzayBiZWZvcmUgZXhpdGlu Zy4KICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogICAgIGZvckVhY2hOZXR3 b3JrU2Vzc2lvbihbJl0gKGF1dG8mIG5ldHdvcmtTZXNzaW9uKSB7Ci0gICAgICAgIG5ldHdvcmtT ZXNzaW9uLmRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKFtjYWxsYmFja0FnZ3JlZ2F0b3Ig PSBjYWxsYmFja0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOworICAgICAgICBuZXR3b3JrU2Vz c2lvbi5mbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoW2NhbGxiYWNrQWdncmVnYXRvciA9 IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7CiAgICAgfSk7CiAjZW5kaWYKICAg ICBwbGF0Zm9ybVN5bmNBbGxDb29raWVzKFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0Fn Z3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtTZXNzaW9uLmNwcAppbmRleCA0NmZmYmQ0MzIxNTJiZjllNDhhYzUxMTVjZmY4 YWZhNjM3MTYzMDYwLi42YjY2YmNmMjIyMGMzNWJhZWE2ZDJiYjU4ZTEzMDE4OGQxNjY2OGE4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcApA QCAtMTQ4LDYgKzE0OCwxNCBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uOjpkZXN0cm95UmVzb3VyY2VM b2FkU3RhdGlzdGljcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgYwogICAgIG1fcmVzb3Vy Y2VMb2FkU3RhdGlzdGljcy0+ZGlkRGVzdHJveU5ldHdvcmtTZXNzaW9uKFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKTsKICAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBudWxscHRyOwog fQorCit2b2lkIE5ldHdvcmtTZXNzaW9uOjpmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUo Q29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIGlm ICghbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKQorICAgICAgICByZXR1cm4gY29tcGxldGlvbkhh bmRsZXIoKTsKKworICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+Zmx1c2hBbmREZXN0cm95 UGVyc2lzdGVudFN0b3JlKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKK30KICNlbmRpZgog CiB2b2lkIE5ldHdvcmtTZXNzaW9uOjppbnZhbGlkYXRlQW5kQ2FuY2VsKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAppbmRleCBkOGQzZWNiYWQ4ZTY4 ODUwNmE4ODU2NDA4OTE4NDhhMmJhMDZlNDNhLi5mMzIyMDMyMTNiZmI5MDU5MjQ2YmM0NGYxMzFi OTQxOTYyYjkyZGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U2Vzc2lvbi5oCkBAIC0xMDYsNiArMTA2LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGhpcmRQ YXJ0eUNvb2tpZUJsb2NraW5nTW9kZShXZWJDb3JlOjpUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdN b2RlKTsKICAgICB2b2lkIHNldFNob3VsZEVuYmxlU2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVudChX ZWJDb3JlOjpTYW1lU2l0ZVN0cmljdEVuZm9yY2VtZW50RW5hYmxlZCk7CiAgICAgdm9pZCBkZXN0 cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwor ICAgIHZvaWQgZmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKENvbXBsZXRpb25IYW5kbGVy PHZvaWQoKT4mJik7CiAjZW5kaWYKICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaGFzQXBwQm91bmRT ZXNzaW9uKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0K 402334 2020-06-19 15:23:12 -0700 2020-06-19 16:36:55 -0700 Patch for landing bug-213391-20200619152311.patch text/plain 8036 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlNWEzYjRhNmU5MDRmNDRm NmU1ZGNmMThlOWU2MmRhZmE2YTJhMGIuLmY4MDc3ODNiNTE2NDVlNmQxZjUxZjA1N2E0NGI1NDNh ZGI2NDE2MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjAtMDYtMTkgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgY29tLmFwcGxlLldl YktpdC5OZXR3b3JraW5nIGNyYXNoOiBzdXNwZW5kZWQgd2l0aCBsb2NrZWQgc3lzdGVtIGZpbGVz IChvYnNlcnZhdGlvbnMuZGIpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTMzOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NDk0MTY3PgorCisg ICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIElUUCBpcyB0aGUgb25s eSBkYXRhYmFzZSB0aGF0IGF0dGVtcHRzIHRvIGNsb3NlIHdoZW4KKyAgICAgICAgTmV0d29ya1By b2Nlc3M6OmRpZENsb3NlKCkgaXMgY2FsbGVkLiBUaGlzIGNhdXNlcyB0aGUgbmV0d29yayBwcm9j ZXNzCisgICAgICAgIHRvIHNvbWV0aW1lcyBjcmFzaCBpZiB0aGUgZGF0YWJhc2UgaXMgc3RpbGwg Y2xvc2luZyB3aGVuIGNoZWNraW5nIGZvcgorICAgICAgICBsb2NrZWQgc3lzdGVtIGZpbGVzLiBJ bnN0ZWFkLCB3ZSBzaG91bGQgb25seSBmbHVzaCB0aGUKKyAgICAgICAgbWVtb3J5IHN0b3JlIHRv IGRpc2sgd2hlbiBjYWxsaW5nIE5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSAoaW4gdGhlCisgICAg ICAgIG1lbW9yeSBzdG9yZSBjYXNlKSwgYW5kIG9ubHkgY2xvc2UgdGhlIGRhdGFiYXNlIHdoZW4g dGhlIG5ldHdvcmsgc2Vzc2lvbiBpcyBkZXN0cm95ZWQuIAorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRpZERlc3Ryb3lO ZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6ZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Zmx1c2hBbmREZXN0cm95UGVy c2lzdGVudFN0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICBTcGxpdCBpbnRvIHR3byBmdW5j dGlvbnMsIG9uZSB0byBmbHVzaCBhbmQgZGVzdHJveSB0aGUgcGVyc2lzdGVudAorICAgICAgICBz dG9yZSwgYW5kIG9uZSB0byBkZXN0cm95IHRoZSBtZW1vcnkgb3IgZGF0YWJhc2Ugc3RvcmUuCisK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSk6CisgICAgICAgIE9ubHkgZmx1c2ggdGhl IHBlcnNpc3RlbnQgc3RvcmUgaGVyZSwgYXMgZGVzY3JpYmVkIGFib3ZlLgorCisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrU2Vzc2lvbjo6Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDIwLTA2LTE3ICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVmZXJlbmNlcyB0byBibGFj a2xpc3Qvd2hpdGVsaXN0IGluIHRoZSBvbGQgQyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZGE2N2MwZjdlZjVkNzRiMDUwZDM1ZjQ2 NjliMzlhZmExMjc4NGJmMC4uNjFjMmUyZGU1MDI2MWJiYmQ4NjkyOTg0OWEwZDlhZGQ5ZjcyZmQw MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK QEAgLTIyMiw4ICsyMjIsMTMgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OmRpZERlc3Ryb3lOZXR3b3JrU2Vzc2lvbihDb21wbGV0aW9uSGFuZGxlcjwKIHsKICAgICBBU1NF UlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCisgICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBD YWxsYmFja0FnZ3JlZ2F0b3I6OmNyZWF0ZShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy KCk7CisgICAgfSk7CisKICAgICBtX25ldHdvcmtTZXNzaW9uID0gbnVsbHB0cjsKLSAgICBmbHVz aEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor ICAgIGZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7 IH0pOworICAgIGRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUoW2NhbGxiYWNrQWdn cmVnYXRvcl0geyB9KTsKIH0KIAogaW5saW5lIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpwb3N0VGFzayhXVEY6OkZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQpAQCAtMjQzLDYg KzI0OCwxNiBAQCBpbmxpbmUgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnBv c3RUYXNrUmVwbHkoV1RGOjpGdW5jdGlvbjx2b2lkKCk+JgogICAgIFJ1bkxvb3A6Om1haW4oKS5k aXNwYXRjaChXVEZNb3ZlKHJlcGx5KSk7CiB9CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKENvbXBsZXRpb25I YW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBSRUxFQVNFX0FTU0VS VChSdW5Mb29wOjppc01haW4oKSk7CisKKyAgICBwb3N0VGFzayhbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpXSgpIG11dGFibGUgeworICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZSA9IG51bGxw dHI7CisgICAgICAgIHBvc3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor ICAgIH0pOworfQorCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Zmx1c2hB bmREZXN0cm95UGVyc2lzdGVudFN0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21w bGV0aW9uSGFuZGxlcikKIHsKICAgICBSRUxFQVNFX0FTU0VSVChSdW5Mb29wOjppc01haW4oKSk7 CkBAIC0yNTEsNyArMjY2LDYgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OmZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGEKICAgICAvLyBpcyBk ZXN0cm95ZWQgYmVjYXVzZSBpdCBoYXMgYSBDKysgcmVmZXJlbmNlIHRvIHVzLgogICAgIG1fc3Rh dGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoKSBt dXRhYmxlIHsKICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFnZSA9IG51bGxwdHI7Ci0gICAgICAg IG1fc3RhdGlzdGljc1N0b3JlID0gbnVsbHB0cjsKICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRp c3BhdGNoKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICB9KTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3Np Zmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCAzODk3ZDUxYWE5ODE5 Y2FjNTY4M2ZmMDdhNDczZWM4MjUxYWViYzc4Li5iMTcwNDZjOGQyMDRjNTk4MDk0NzY3MTE0NzMx NThkOTFmYTFjYjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oCkBAIC0yOTksNiArMjk5LDcgQEAgc3RydWN0IFRoaXJkUGFydHlEYXRhIHsKICAgICAK ICAgICBib29sIGlzRXBoZW1lcmFsKCkgY29uc3QgeyByZXR1cm4gbV9pc0VwaGVtZXJhbCA9PSBX ZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjpJc0VwaGVtZXJhbDo6WWVzOyB9OwogICAg IHZvaWQgaW5zZXJ0RXhwaXJlZFN0YXRpc3RpY0ZvclRlc3RpbmcoY29uc3QgUmVnaXN0cmFibGVE b21haW4mLCBib29sIGhhZFVzZXJJbnRlcmFjdGlvbiwgYm9vbCBpc1NjaGVkdWxlZEZvckFsbEJ1 dENvb2tpZURhdGFSZW1vdmFsLCBib29sIGlzUHJldmFsZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKCk+JiYpOworICAgIHZvaWQgZmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKE5ldHdvcmtTZXNzaW9uJiwgY29uc3QgU3RyaW5nJiwg U2hvdWxkSW5jbHVkZUxvY2FsaG9zdCwgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljczo6 SXNFcGhlbWVyYWwpOwpAQCAtMzE5LDcgKzMyMCw3IEBAIHByaXZhdGU6CiAKICAgICBTdG9yYWdl QWNjZXNzU3RhdHVzIHN0b3JhZ2VBY2Nlc3NTdGF0dXMoY29uc3QgU3RyaW5nJiBzdWJGcmFtZVBy aW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgdG9wRnJhbWVQcmltYXJ5RG9tYWluKTsKIAotICAg IHZvaWQgZmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZv aWQoKT4mJik7CisgICAgdm9pZCBkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKENv bXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAKICAgICBXZWFrUHRyPE5ldHdvcmtTZXNzaW9u PiBtX25ldHdvcmtTZXNzaW9uOwogICAgIFJlZjxXVEY6OldvcmtRdWV1ZT4gbV9zdGF0aXN0aWNz UXVldWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu Y3BwCmluZGV4IGU2MTM1YzYyYzFjY2MwMGRkMmNmMDVkMmE3ZDQxNTkxYjMwZTc2M2IuLjM2NzYy MjQ3ZDM5MzViMjEzZDg2NjdiNjUzZDIzNWUxNTAxM2QzNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0yNjcsNyArMjY3LDcgQEAg dm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGlkQ2xvc2UoSVBDOjpDb25uZWN0aW9uJikKICAgICAvLyBN YWtlIHN1cmUgd2UgZmx1c2ggYWxsIGNvb2tpZXMgYW5kIHJlc291cmNlIGxvYWQgc3RhdGlzdGlj cyB0byBkaXNrIGJlZm9yZSBleGl0aW5nLgogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJ U1RJQ1MpCiAgICAgZm9yRWFjaE5ldHdvcmtTZXNzaW9uKFsmXSAoYXV0byYgbmV0d29ya1Nlc3Np b24pIHsKLSAgICAgICAgbmV0d29ya1Nlc3Npb24uZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3Rp Y3MoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsg fSk7CisgICAgICAgIG5ldHdvcmtTZXNzaW9uLmZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9y ZShbY2FsbGJhY2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9 KTsKICAgICB9KTsKICNlbmRpZgogICAgIHBsYXRmb3JtU3luY0FsbENvb2tpZXMoW2NhbGxiYWNr QWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCmluZGV4IDQ2ZmZi ZDQzMjE1MmJmOWU0OGFjNTExNWNmZjhhZmE2MzcxNjMwNjAuLjZiNjZiY2YyMjIwYzM1YmFlYTZk MmJiNThlMTMwMTg4ZDE2NjY4YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Nlc3Npb24uY3BwCkBAIC0xNDgsNiArMTQ4LDE0IEBAIHZvaWQgTmV0d29ya1Nl c3Npb246OmRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRpb25IYW5kbGVyPHZv aWQoKT4mJiBjCiAgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5kaWREZXN0cm95TmV0d29y a1Nlc3Npb24oV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgIG1fcmVzb3VyY2VMb2Fk U3RhdGlzdGljcyA9IG51bGxwdHI7CiB9CisKK3ZvaWQgTmV0d29ya1Nlc3Npb246OmZsdXNoQW5k RGVzdHJveVBlcnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCit7CisgICAgaWYgKCFtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MpCisgICAg ICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcigpOworCisgICAgbV9yZXNvdXJjZUxvYWRTdGF0 aXN0aWNzLT5mbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoV1RGTW92ZShjb21wbGV0aW9u SGFuZGxlcikpOworfQogI2VuZGlmCiAKIHZvaWQgTmV0d29ya1Nlc3Npb246OmludmFsaWRhdGVB bmRDYW5jZWwoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrU2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lv bi5oCmluZGV4IGQ4ZDNlY2JhZDhlNjg4NTA2YTg4NTY0MDg5MTg0OGEyYmEwNmU0M2EuLmYzMjIw MzIxM2JmYjkwNTkyNDZiYzQ0ZjEzMWI5NDE5NjJiOTJkZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKQEAgLTEwNiw2ICsxMDYsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKFdlYkNvcmU6OlRo aXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUpOwogICAgIHZvaWQgc2V0U2hvdWxkRW5ibGVTYW1l U2l0ZVN0cmljdEVuZm9yY2VtZW50KFdlYkNvcmU6OlNhbWVTaXRlU3RyaWN0RW5mb3JjZW1lbnRF bmFibGVkKTsKICAgICB2b2lkIGRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKENvbXBsZXRp b25IYW5kbGVyPHZvaWQoKT4mJik7CisgICAgdm9pZCBmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50 U3RvcmUoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICNlbmRpZgogICAgIAogICAgIHZp cnR1YWwgYm9vbCBoYXNBcHBCb3VuZFNlc3Npb24oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQo= 402344 2020-06-19 16:36:57 -0700 2020-06-19 17:02:28 -0700 Patch for landing bug-213391-20200619163656.patch text/plain 8118 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlNWEzYjRhNmU5MDRmNDRm NmU1ZGNmMThlOWU2MmRhZmE2YTJhMGIuLmY4MDc3ODNiNTE2NDVlNmQxZjUxZjA1N2E0NGI1NDNh ZGI2NDE2MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjAtMDYtMTkgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgY29tLmFwcGxlLldl YktpdC5OZXR3b3JraW5nIGNyYXNoOiBzdXNwZW5kZWQgd2l0aCBsb2NrZWQgc3lzdGVtIGZpbGVz IChvYnNlcnZhdGlvbnMuZGIpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTMzOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NDk0MTY3PgorCisg ICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIElUUCBpcyB0aGUgb25s eSBkYXRhYmFzZSB0aGF0IGF0dGVtcHRzIHRvIGNsb3NlIHdoZW4KKyAgICAgICAgTmV0d29ya1By b2Nlc3M6OmRpZENsb3NlKCkgaXMgY2FsbGVkLiBUaGlzIGNhdXNlcyB0aGUgbmV0d29yayBwcm9j ZXNzCisgICAgICAgIHRvIHNvbWV0aW1lcyBjcmFzaCBpZiB0aGUgZGF0YWJhc2UgaXMgc3RpbGwg Y2xvc2luZyB3aGVuIGNoZWNraW5nIGZvcgorICAgICAgICBsb2NrZWQgc3lzdGVtIGZpbGVzLiBJ bnN0ZWFkLCB3ZSBzaG91bGQgb25seSBmbHVzaCB0aGUKKyAgICAgICAgbWVtb3J5IHN0b3JlIHRv IGRpc2sgd2hlbiBjYWxsaW5nIE5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSAoaW4gdGhlCisgICAg ICAgIG1lbW9yeSBzdG9yZSBjYXNlKSwgYW5kIG9ubHkgY2xvc2UgdGhlIGRhdGFiYXNlIHdoZW4g dGhlIG5ldHdvcmsgc2Vzc2lvbiBpcyBkZXN0cm95ZWQuIAorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRpZERlc3Ryb3lO ZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6ZGVzdHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Zmx1c2hBbmREZXN0cm95UGVy c2lzdGVudFN0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICBTcGxpdCBpbnRvIHR3byBmdW5j dGlvbnMsIG9uZSB0byBmbHVzaCBhbmQgZGVzdHJveSB0aGUgcGVyc2lzdGVudAorICAgICAgICBz dG9yZSwgYW5kIG9uZSB0byBkZXN0cm95IHRoZSBtZW1vcnkgb3IgZGF0YWJhc2Ugc3RvcmUuCisK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSk6CisgICAgICAgIE9ubHkgZmx1c2ggdGhl IHBlcnNpc3RlbnQgc3RvcmUgaGVyZSwgYXMgZGVzY3JpYmVkIGFib3ZlLgorCisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrU2Vzc2lvbjo6Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKToKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDIwLTA2LTE3ICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVmZXJlbmNlcyB0byBibGFj a2xpc3Qvd2hpdGVsaXN0IGluIHRoZSBvbGQgQyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZGE2N2MwZjdlZjVkNzRiMDUwZDM1ZjQ2 NjliMzlhZmExMjc4NGJmMC4uNTNiNGE3YWEwN2M1NGVlMWY2N2I2MmQzZDEyOGJiMzU2NjlmNTg3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK QEAgLTIyMiw4ICsyMjIsMTMgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OmRpZERlc3Ryb3lOZXR3b3JrU2Vzc2lvbihDb21wbGV0aW9uSGFuZGxlcjwKIHsKICAgICBBU1NF UlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCisgICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBD YWxsYmFja0FnZ3JlZ2F0b3I6OmNyZWF0ZShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy KCk7CisgICAgfSk7CisKICAgICBtX25ldHdvcmtTZXNzaW9uID0gbnVsbHB0cjsKLSAgICBmbHVz aEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor ICAgIGZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7 IH0pOworICAgIGRlc3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUoW2NhbGxiYWNrQWdn cmVnYXRvcl0geyB9KTsKIH0KIAogaW5saW5lIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpwb3N0VGFzayhXVEY6OkZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQpAQCAtMjQzLDYg KzI0OCwyMSBAQCBpbmxpbmUgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnBv c3RUYXNrUmVwbHkoV1RGOjpGdW5jdGlvbjx2b2lkKCk+JgogICAgIFJ1bkxvb3A6Om1haW4oKS5k aXNwYXRjaChXVEZNb3ZlKHJlcGx5KSk7CiB9CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKENvbXBsZXRpb25I YW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBSRUxFQVNFX0FTU0VS VChSdW5Mb29wOjppc01haW4oKSk7CisKKyAgICBpZiAoaXNFcGhlbWVyYWwoKSkgeworICAgICAg ICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgcG9z dFRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAgICAg bV9zdGF0aXN0aWNzU3RvcmUgPSBudWxscHRyOworICAgICAgICBwb3N0VGFza1JlcGx5KFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICB9KTsKK30KKwogdm9pZCBXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6OmZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRTdG9yZShDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgUkVMRUFTRV9B U1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwpAQCAtMjUxLDcgKzI3MSw2IEBAIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUo Q29tcGxldGlvbkhhCiAgICAgLy8gaXMgZGVzdHJveWVkIGJlY2F1c2UgaXQgaGFzIGEgQysrIHJl ZmVyZW5jZSB0byB1cy4KICAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHBy b3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgIG1fcGVyc2lzdGVudFN0 b3JhZ2UgPSBudWxscHRyOwotICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZSA9IG51bGxwdHI7CiAg ICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KSk7CiAgICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmggYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlLmgKaW5kZXggMzg5N2Q1MWFhOTgxOWNhYzU2ODNmZjA3YTQ3M2VjODI1MWFlYmM3OC4uYjE3 MDQ2YzhkMjA0YzU5ODA5NDc2NzExNDczMTU4ZDkxZmExY2IxNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaApAQCAtMjk5LDYgKzI5OSw3IEBAIHN0cnVj dCBUaGlyZFBhcnR5RGF0YSB7CiAgICAgCiAgICAgYm9vbCBpc0VwaGVtZXJhbCgpIGNvbnN0IHsg cmV0dXJuIG1faXNFcGhlbWVyYWwgPT0gV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljczo6 SXNFcGhlbWVyYWw6OlllczsgfTsKICAgICB2b2lkIGluc2VydEV4cGlyZWRTdGF0aXN0aWNGb3JU ZXN0aW5nKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiwgYm9vbCBoYWRVc2VySW50ZXJhY3Rpb24s IGJvb2wgaXNTY2hlZHVsZWRGb3JBbGxCdXRDb29raWVEYXRhUmVtb3ZhbCwgYm9vbCBpc1ByZXZh bGVudCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKKyAgICB2b2lkIGZsdXNoQW5kRGVz dHJveVBlcnNpc3RlbnRTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogCiBwcml2 YXRlOgogICAgIGV4cGxpY2l0IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZShOZXR3b3Jr U2Vzc2lvbiYsIGNvbnN0IFN0cmluZyYsIFNob3VsZEluY2x1ZGVMb2NhbGhvc3QsIFdlYkNvcmU6 OlJlc291cmNlTG9hZFN0YXRpc3RpY3M6OklzRXBoZW1lcmFsKTsKQEAgLTMxOSw3ICszMjAsNyBA QCBwcml2YXRlOgogCiAgICAgU3RvcmFnZUFjY2Vzc1N0YXR1cyBzdG9yYWdlQWNjZXNzU3RhdHVz KGNvbnN0IFN0cmluZyYgc3ViRnJhbWVQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHRvcEZy YW1lUHJpbWFyeURvbWFpbik7CiAKLSAgICB2b2lkIGZsdXNoQW5kRGVzdHJveVBlcnNpc3RlbnRT dG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAgIHZvaWQgZGVzdHJveVJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogCiAg ICAgV2Vha1B0cjxOZXR3b3JrU2Vzc2lvbj4gbV9uZXR3b3JrU2Vzc2lvbjsKICAgICBSZWY8V1RG OjpXb3JrUXVldWU+IG1fc3RhdGlzdGljc1F1ZXVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCBlNjEzNWM2MmMxY2NjMDBkZDJjZjA1 ZDJhN2Q0MTU5MWIzMGU3NjNiLi4zNjc2MjI0N2QzOTM1YjIxM2Q4NjY3YjY1M2QyMzVlMTUwMTNk MzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNz LmNwcApAQCAtMjY3LDcgKzI2Nyw3IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRpZENsb3NlKElQ Qzo6Q29ubmVjdGlvbiYpCiAgICAgLy8gTWFrZSBzdXJlIHdlIGZsdXNoIGFsbCBjb29raWVzIGFu ZCByZXNvdXJjZSBsb2FkIHN0YXRpc3RpY3MgdG8gZGlzayBiZWZvcmUgZXhpdGluZy4KICNpZiBF TkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogICAgIGZvckVhY2hOZXR3b3JrU2Vzc2lv bihbJl0gKGF1dG8mIG5ldHdvcmtTZXNzaW9uKSB7Ci0gICAgICAgIG5ldHdvcmtTZXNzaW9uLmRl c3Ryb3lSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOworICAgICAgICBuZXR3b3JrU2Vzc2lvbi5mbHVz aEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNr QWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7CiAgICAgfSk7CiAjZW5kaWYKICAgICBwbGF0Zm9y bVN5bmNBbGxDb29raWVzKFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0FnZ3JlZ2F0b3Iu Y29weVJlZigpXSB7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtTZXNzaW9uLmNwcAppbmRleCA0NmZmYmQ0MzIxNTJiZjllNDhhYzUxMTVjZmY4YWZhNjM3MTYz MDYwLi42YjY2YmNmMjIyMGMzNWJhZWE2ZDJiYjU4ZTEzMDE4OGQxNjY2OGE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcApAQCAtMTQ4LDYg KzE0OCwxNCBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uOjpkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlz dGljcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgYwogICAgIG1fcmVzb3VyY2VMb2FkU3Rh dGlzdGljcy0+ZGlkRGVzdHJveU5ldHdvcmtTZXNzaW9uKFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpKTsKICAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBudWxscHRyOwogfQorCit2b2lk IE5ldHdvcmtTZXNzaW9uOjpmbHVzaEFuZERlc3Ryb3lQZXJzaXN0ZW50U3RvcmUoQ29tcGxldGlv bkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIGlmICghbV9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzKQorICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoKTsK KworICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVu dFN0b3JlKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKK30KICNlbmRpZgogCiB2b2lkIE5l dHdvcmtTZXNzaW9uOjppbnZhbGlkYXRlQW5kQ2FuY2VsKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAppbmRleCBkOGQzZWNiYWQ4ZTY4ODUwNmE4ODU2 NDA4OTE4NDhhMmJhMDZlNDNhLi5mMzIyMDMyMTNiZmI5MDU5MjQ2YmM0NGYxMzFiOTQxOTYyYjky ZGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNz aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5o CkBAIC0xMDYsNiArMTA2LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGhpcmRQYXJ0eUNvb2tp ZUJsb2NraW5nTW9kZShXZWJDb3JlOjpUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKTsKICAg ICB2b2lkIHNldFNob3VsZEVuYmxlU2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVudChXZWJDb3JlOjpT YW1lU2l0ZVN0cmljdEVuZm9yY2VtZW50RW5hYmxlZCk7CiAgICAgdm9pZCBkZXN0cm95UmVzb3Vy Y2VMb2FkU3RhdGlzdGljcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAgIHZvaWQg Zmx1c2hBbmREZXN0cm95UGVyc2lzdGVudFN0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m Jik7CiAjZW5kaWYKICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaGFzQXBwQm91bmRTZXNzaW9uKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH0K