189684 2018-09-17 17:06:54 -0700 Clear persistent storage between tests for resourceLoadStatistics 2018-10-01 12:26:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wwang153 wwang153 bfulgham cdumez commit-queue realdawei webkit-bug-importer wilander oldest_to_newest 1460422 0 wwang153 2018-09-17 17:06:54 -0700 Currently, in WKWebsiteDataStoreStatisticsResetToConsistentState, only the resource load statistics' maps in the UI process and web content processes are cleared, but the persistent storage is not. This patch deletes the plist on disk between tests when resetting to a consistent state. 1460424 1 webkit-bug-importer 2018-09-17 17:07:38 -0700 <rdar://problem/44539993> 1460425 2 wwang153 2018-09-17 17:08:37 -0700 This is a speculative fix for the flakiness seen here: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=http%2Ftests%2FwebAPIStatistics%2Fnavigator-functions-accessed-data-collection.html%20http%2Ftests%2FwebAPIStatistics%2Fcanvas-read-and-write-data-collection.html%20http%2Ftests%2FwebAPIStatistics%2Ffont-load-data-collection.html%20http%2Ftests%2FwebAPIStatistics%2Fscreen-functions-accessed-data-collection.html Some of the data from previous tests (canvas data collection) leaks into subsequent tests (font loading data collection). This patch deletes the plist between tests, hopefully to rule out that as a source of flakiness. 1460426 3 webkit-bug-importer 2018-09-17 17:08:56 -0700 <rdar://problem/44540099> 1460432 4 349977 wwang153 2018-09-17 17:20:32 -0700 Created attachment 349977 Patch 1460434 5 349977 wilander 2018-09-17 17:26:55 -0700 Comment on attachment 349977 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349977&action=review > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:778 > + m_memoryStore->clear([callbackAggregator = callbackAggregator.copyRef()] { }); You need to clear the memory store before you grandfather, otherwise you'll clear the grandfathered entries. Further, you should grandfather in the completion handler of m_memoryStore->clear() to not run the risk of a race. This will remove the need for the callback aggregator. 1460441 6 wwang153 2018-09-17 17:40:13 -0700 (In reply to John Wilander from comment #5) > Comment on attachment 349977 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=349977&action=review > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:778 > > + m_memoryStore->clear([callbackAggregator = callbackAggregator.copyRef()] { }); > > You need to clear the memory store before you grandfather, otherwise you'll > clear the grandfathered entries. I'll fix that. > > Further, you should grandfather in the completion handler of > m_memoryStore->clear() to not run the risk of a race. This will remove the > need for the callback aggregator. Great point, I'll update this shortly! 1460456 7 349986 wwang153 2018-09-17 18:18:00 -0700 Created attachment 349986 Patch 1460600 8 349986 cdumez 2018-09-18 08:54:29 -0700 Comment on attachment 349986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349986&action=review r=me with fixes. > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:775 > + m_memoryStore->clear([this, shouldGrandfather, callCompletionHandlerOnMainThread = WTFMove(callCompletionHandlerOnMainThread)] () mutable { this, protectedThis = makeRef(*this) I think you need to protect this here since there is nothing that guarantees that |this| stays alive AFAICT. > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > + m_memoryStore->grandfatherExistingWebsiteData(WTFMove(callCompletionHandlerOnMainThread)); You likely need to null-check m_memoryStore here. It would have been cleared in between. 1460624 9 wilander 2018-09-18 10:00:45 -0700 (In reply to Chris Dumez from comment #8) > Comment on attachment 349986 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=349986&action=review > > r=me with fixes. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:775 > > + m_memoryStore->clear([this, shouldGrandfather, callCompletionHandlerOnMainThread = WTFMove(callCompletionHandlerOnMainThread)] () mutable { > > this, protectedThis = makeRef(*this) > > I think you need to protect this here since there is nothing that guarantees > that |this| stays alive AFAICT. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > > + m_memoryStore->grandfatherExistingWebsiteData(WTFMove(callCompletionHandlerOnMainThread)); > > You likely need to null-check m_memoryStore here. It would have been cleared > in between. Could you also ASSERT m_memoryStore, please? I'd like to know if we're failing to grandfather website data. 1460626 10 wwang153 2018-09-18 10:07:56 -0700 (In reply to Chris Dumez from comment #8) > Comment on attachment 349986 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=349986&action=review > > r=me with fixes. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:775 > > + m_memoryStore->clear([this, shouldGrandfather, callCompletionHandlerOnMainThread = WTFMove(callCompletionHandlerOnMainThread)] () mutable { > > this, protectedThis = makeRef(*this) > > I think you need to protect this here since there is nothing that guarantees > that |this| stays alive AFAICT. I'll add this. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > > + m_memoryStore->grandfatherExistingWebsiteData(WTFMove(callCompletionHandlerOnMainThread)); > > You likely need to null-check m_memoryStore here. It would have been cleared > in between. Good call, I'll also ASSERT m_memoryStore so we will know if grandfathering has happened as expected. 1460640 11 350032 wwang153 2018-09-18 10:30:07 -0700 Created attachment 350032 Patch 1460694 12 350032 cdumez 2018-09-18 13:13:17 -0700 Comment on attachment 350032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350032&action=review > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > + ASSERT(m_memoryStore); I do not believe this assertion is correct. There is no such guarantee. If applicationWillTerminate() gets called, we'll destroy m_memoryStore. 1460695 13 wilander 2018-09-18 13:17:30 -0700 (In reply to Chris Dumez from comment #12) > Comment on attachment 350032 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350032&action=review > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > > + ASSERT(m_memoryStore); > > I do not believe this assertion is correct. There is no such guarantee. If > applicationWillTerminate() gets called, we'll destroy m_memoryStore. Are you saying we'll hit this assertion in the TestRunner on debug bots? How would you rather check that we don't have regular cases where the memory store is null when we're supposed to grandfather? 1460696 14 cdumez 2018-09-18 13:22:42 -0700 (In reply to John Wilander from comment #13) > (In reply to Chris Dumez from comment #12) > > Comment on attachment 350032 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=350032&action=review > > > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > > > + ASSERT(m_memoryStore); > > > > I do not believe this assertion is correct. There is no such guarantee. If > > applicationWillTerminate() gets called, we'll destroy m_memoryStore. > > Are you saying we'll hit this assertion in the TestRunner on debug bots? How > would you rather check that we don't have regular cases where the memory > store is null when we're supposed to grandfather? Probably not on the bots but people will be able to hit it on their device is some code calls scheduleClearInMemoryAndPersistent(ShouldGrandfather::Yes) and then exit the application quickly. 1460698 15 wilander 2018-09-18 13:24:35 -0700 (In reply to Chris Dumez from comment #14) > (In reply to John Wilander from comment #13) > > (In reply to Chris Dumez from comment #12) > > > Comment on attachment 350032 [details] > > > Patch > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=350032&action=review > > > > > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > > > > + ASSERT(m_memoryStore); > > > > > > I do not believe this assertion is correct. There is no such guarantee. If > > > applicationWillTerminate() gets called, we'll destroy m_memoryStore. > > > > Are you saying we'll hit this assertion in the TestRunner on debug bots? How > > would you rather check that we don't have regular cases where the memory > > store is null when we're supposed to grandfather? > > Probably not on the bots but people will be able to hit it on their device > is some code calls > scheduleClearInMemoryAndPersistent(ShouldGrandfather::Yes) and then exit the > application quickly. Are people using debug builds that way? I've never come across that we take application quit into consideration when we add a correctness debug ASSERT. 1460700 16 350032 cdumez 2018-09-18 13:25:19 -0700 Comment on attachment 350032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350032&action=review > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:-793 > - if (shouldGrandfather == ShouldGrandfather::Yes && m_memoryStore) Also note that the previous code was doing a null check as expected. >>>> Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 >>>> + ASSERT(m_memoryStore); >>> >>> I do not believe this assertion is correct. There is no such guarantee. If applicationWillTerminate() gets called, we'll destroy m_memoryStore. >> >> Are you saying we'll hit this assertion in the TestRunner on debug bots? How would you rather check that we don't have regular cases where the memory store is null when we're supposed to grandfather? > > Probably not on the bots but people will be able to hit it on their device is some code calls scheduleClearInMemoryAndPersistent(ShouldGrandfather::Yes) and then exit the application quickly. Also note that this assertion would anyway not cover the case where m_memoryStore is null before we call clear... > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:781 > + callCompletionHandlerOnMainThread(); i.e. this code path. 1460704 17 cdumez 2018-09-18 13:30:05 -0700 (In reply to John Wilander from comment #15) > (In reply to Chris Dumez from comment #14) > > (In reply to John Wilander from comment #13) > > > (In reply to Chris Dumez from comment #12) > > > > Comment on attachment 350032 [details] > > > > Patch > > > > > > > > View in context: > > > > https://bugs.webkit.org/attachment.cgi?id=350032&action=review > > > > > > > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:777 > > > > > + ASSERT(m_memoryStore); > > > > > > > > I do not believe this assertion is correct. There is no such guarantee. If > > > > applicationWillTerminate() gets called, we'll destroy m_memoryStore. > > > > > > Are you saying we'll hit this assertion in the TestRunner on debug bots? How > > > would you rather check that we don't have regular cases where the memory > > > store is null when we're supposed to grandfather? > > > > Probably not on the bots but people will be able to hit it on their device > > is some code calls > > scheduleClearInMemoryAndPersistent(ShouldGrandfather::Yes) and then exit the > > application quickly. > > Are people using debug builds that way? I've never come across that we take > application quit into consideration when we add a correctness debug ASSERT. We have to worry about application termination here because: void WebResourceLoadStatisticsStore::applicationWillTerminate() { flushAndDestroyPersistentStore(); } We do a best effort at flushing things to disk before exiting the app, and then we destroy the objects. It is not OK to add an assertion that can hit in valid use cases, even if those cases are rare. 1460751 18 350059 wwang153 2018-09-18 14:34:53 -0700 Created attachment 350059 Patch 1460754 19 350059 cdumez 2018-09-18 14:38:21 -0700 Comment on attachment 350059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350059&action=review > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:780 > + RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent m_memoryStore is null when trying to grandfather data."); Why log here but not.. > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:786 > callCompletionHandlerOnMainThread(); .. here? 1460802 20 wwang153 2018-09-18 16:19:16 -0700 (In reply to Chris Dumez from comment #19) > Comment on attachment 350059 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350059&action=review > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:780 > > + RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent m_memoryStore is null when trying to grandfather data."); > > Why log here but not.. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:786 > > callCompletionHandlerOnMainThread(); > > .. here? To my understanding, the existing log is useful as we expect when grandfathering is requested that the memory store is non-null. The latter site is where we have no memory store to clear at all in the function, which seems like possible behavior. If this is unexpected, what should the log statement be? 1460803 21 350059 cdumez 2018-09-18 16:33:19 -0700 Comment on attachment 350059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350059&action=review >>> Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:780 >>> + RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent m_memoryStore is null when trying to grandfather data."); >> >> Why log here but not.. > > To my understanding, the existing log is useful as we expect when grandfathering is requested that the memory store is non-null. The latter site is where we have no memory store to clear at all in the function, which seems like possible behavior. If this is unexpected, what should the log statement be? You could do the exact same login gin the else case below if (shouldGrandfather == ShouldGrandfather::Yes). There is no difference really. It is just a matter a timing: was the memory store destroyed before or after the call to clear() ? 1460817 22 wwang153 2018-09-18 17:13:01 -0700 (In reply to Chris Dumez from comment #21) > Comment on attachment 350059 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350059&action=review > > >>> Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:780 > >>> + RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent m_memoryStore is null when trying to grandfather data."); > >> > >> Why log here but not.. > > > > To my understanding, the existing log is useful as we expect when grandfathering is requested that the memory store is non-null. The latter site is where we have no memory store to clear at all in the function, which seems like possible behavior. If this is unexpected, what should the log statement be? > > You could do the exact same login gin the else case below if > (shouldGrandfather == ShouldGrandfather::Yes). There is no difference > really. It is just a matter a timing: was the memory store destroyed before > or after the call to clear() ? I see, I can add the extra logging statement with slightly different wording to differentiate the two cases. 1460820 23 350082 wwang153 2018-09-18 17:39:13 -0700 Created attachment 350082 Patch 1460981 24 350082 cdumez 2018-09-19 09:10:00 -0700 Comment on attachment 350082 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350082&action=review Please see if you can refactor this code a bit so that it is not as big and not as error prone. You may also consider using CompletionHandlerCallingScope to make sure the completion handler is always called. > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:780 > + RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent After being cleared, m_memoryStore is null when trying to grandfather data."); The completion is not called in this case, which is wrong. > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:785 > + } else The else case is multi-line so you need curly brackets. > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:788 > + else This is wrong, you now fail to call the completion handler in the if case. This else should be dropped so that callCompletionHandlerOnMainThread() is always called. 1461014 25 wwang153 2018-09-19 10:14:51 -0700 (In reply to Chris Dumez from comment #24) > Comment on attachment 350082 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350082&action=review > > Please see if you can refactor this code a bit so that it is not as big and > not as error prone. You may also consider using > CompletionHandlerCallingScope to make sure the completion handler is always > called. I'll refactor the code to use CompletionHandlerCallingScope to ensure the completion handler is always called. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:780 > > + RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent After being cleared, m_memoryStore is null when trying to grandfather data."); > > The completion is not called in this case, which is wrong. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:785 > > + } else > > The else case is multi-line so you need curly brackets. > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:788 > > + else > > This is wrong, you now fail to call the completion handler in the if case. > This else should be dropped so that callCompletionHandlerOnMainThread() is > always called. 1461018 26 350130 wwang153 2018-09-19 10:18:22 -0700 Created attachment 350130 Patch 1461088 27 350130 cdumez 2018-09-19 12:58:39 -0700 Comment on attachment 350130 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350130&action=review > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:769 > CompletionHandler<void()> callCompletionHandlerOnMainThread = [completionHandler = WTFMove(completionHandler)]() mutable { We do not need this local variable anymore, we could just inline the lambda when constructing the CompletionHandlerCallingScope. LGTM otherwise. 1461101 28 350147 wwang153 2018-09-19 13:27:42 -0700 Created attachment 350147 Patch 1461107 29 350147 cdumez 2018-09-19 13:41:33 -0700 Comment on attachment 350147 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350147&action=review > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:772 > + CompletionHandlerCallingScope completionHandlerCaller(WTFMove(callCompletionHandlerOnMainThread)); You still did not inline the lambda in here. 1461127 30 wwang153 2018-09-19 14:26:14 -0700 (In reply to Chris Dumez from comment #29) > Comment on attachment 350147 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350147&action=review > > > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:772 > > + CompletionHandlerCallingScope completionHandlerCaller(WTFMove(callCompletionHandlerOnMainThread)); > > You still did not inline the lambda in here. Oops, I'll do so right now. 1461137 31 350151 wwang153 2018-09-19 15:08:17 -0700 Created attachment 350151 Patch 1461138 32 350151 cdumez 2018-09-19 15:11:31 -0700 Comment on attachment 350151 Patch LGTM 1461142 33 350151 commit-queue 2018-09-19 15:30:09 -0700 Comment on attachment 350151 Patch Rejecting attachment 350151 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 350151, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebKit/ChangeLog contains OOPS!. Full output: https://webkit-queues.webkit.org/results/9274508 1461156 34 350151 commit-queue 2018-09-19 15:57:30 -0700 Comment on attachment 350151 Patch Clearing flags on attachment: 350151 Committed r236229: <https://trac.webkit.org/changeset/236229> 1461185 35 realdawei 2018-09-19 17:04:57 -0700 (In reply to WebKit Commit Bot from comment #34) > Comment on attachment 350151 [details] > Patch > > Clearing flags on attachment: 350151 > > Committed r236229: <https://trac.webkit.org/changeset/236229> Seeing API Timeouts after on Mac WK1 after this revision sample output: https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/8069/steps/run-api-tests/logs/stdio Test suite failed Timeout TestWebKitAPI.ResourceLoadStatistics.GrandfatherCallback 1461187 36 realdawei 2018-09-19 17:08:27 -0700 (In reply to Dawei Fenton (:realdawei) from comment #35) > (In reply to WebKit Commit Bot from comment #34) > > Comment on attachment 350151 [details] > > Patch > > > > Clearing flags on attachment: 350151 > > > > Committed r236229: <https://trac.webkit.org/changeset/236229> > > Seeing API Timeouts on Mac WK1 after this revision > > sample output: > https://build.webkit.org/builders/ > Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/8069/steps/run-api- > tests/logs/stdio > Test suite failed > > Timeout > > TestWebKitAPI.ResourceLoadStatistics.GrandfatherCallback Also timing out on iOS https://build.webkit.org/builders/Apple%20iOS%2011%20Simulator%20Release%20WK2%20(Tests)/builds/7505/steps/run-api-tests/logs/stdio 1461199 37 realdawei 2018-09-19 17:20:14 -0700 Reverted r236229 for reason: caused API timouts on mac and ios Committed r236233: <https://trac.webkit.org/changeset/236233> 1461594 38 wwang153 2018-09-20 16:37:55 -0700 (In reply to Dawei Fenton (:realdawei) from comment #37) > Reverted r236229 for reason: > > caused API timouts on mac and ios > > Committed r236233: <https://trac.webkit.org/changeset/236233> Submitting another patch with a fix for the timeout on the ResourceLoadStatistics::GrandfatherCallback test. 1461596 39 350279 wwang153 2018-09-20 16:43:29 -0700 Created attachment 350279 Patch 1461863 40 350279 cdumez 2018-09-21 08:50:58 -0700 Comment on attachment 350279 Patch r=me 1461876 41 350279 commit-queue 2018-09-21 09:17:26 -0700 Comment on attachment 350279 Patch Clearing flags on attachment: 350279 Committed r236320: <https://trac.webkit.org/changeset/236320> 1465165 42 wilander 2018-10-01 12:26:48 -0700 Moving to resolved based on the landed patch. 349977 2018-09-17 17:20:32 -0700 2018-09-17 18:17:58 -0700 Patch bug-189684-20180917172030.patch text/plain 4839 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0NTIxMmYzZGNmNmM0ZGZj Y2VlMjE4YWIwNWY4ZmMzYzM0ODg5ZmIuLmI3Mjk3NTQ0MDAwODM1NGE1NzYyMGY5Y2VhNGExMmI2 YjZhMDllMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCA2YzUwODlhZmViNWRl M2Y0ODU5Y2UxNGQwNjMxZWJjYTA3MjQwYTRkLi4xMzhkODQwZjZiNTRmMTA5YTk3YzFjNDZjZTUx NjFmZWQwZjZkOTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNp bmNsdWRlICJXZWJzaXRlRGF0YUZldGNoT3B0aW9uLmgiCiAjaW5jbHVkZSAiV2Vic2l0ZURhdGFT dG9yZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oPgorI2lu Y2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNpbmNsdWRlIDx3dGYvQ3Jvc3NUaHJl YWRDb3BpZXIuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3 dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuaD4KQEAgLTc1OSw0MSArNzYwLDIzIEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2NraW5nU3Rh dGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBw b3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNh bGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxlciA9IFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAgcG9zdFRh c2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0KLSAgICAg ICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlvbkhhbmRs ZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAg ICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25N YWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdyYW5kZmF0 aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBwb3N0 VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9tZW1vcnlT dG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7CiAgICAgICAg IGlmIChtX3BlcnNpc3RlbnRTdG9yYWdlKQogICAgICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFn ZS0+Y2xlYXIoKTsKLSAgICAgICAgCiAgICAgICAgIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4g Y2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkID0gW2NvbXBsZXRpb25IYW5kbGVyID0g V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBwb3N0 VGFza1JlcGx5KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICAgICAgfTsKIAotICAg ICAgICBpZiAoc2hvdWxkR3JhbmRmYXRoZXIgPT0gU2hvdWxkR3JhbmRmYXRoZXI6OlllcyAmJiBt X21lbW9yeVN0b3JlKQotICAgICAgICAgICAgbV9tZW1vcnlTdG9yZS0+Z3JhbmRmYXRoZXJFeGlz dGluZ1dlYnNpdGVEYXRhKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFk KSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFp blRocmVhZCgpOworICAgICAgICBhdXRvIGNhbGxiYWNrQWdncmVnYXRvciA9IENhbGxiYWNrQWdn cmVnYXRvcjo6Y3JlYXRlKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFk KSk7CisKKyAgICAgICAgaWYgKG1fbWVtb3J5U3RvcmUpIHsKKyAgICAgICAgICAgIGlmIChzaG91 bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzKQorICAgICAgICAgICAgICAg IG1fbWVtb3J5U3RvcmUtPmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YShbY2FsbGJhY2tB Z2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9KTsKKyAgICAgICAg ICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0Fn Z3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOworICAgICAgICB9CiAgICAgfSk7CiB9CiAK 349986 2018-09-17 18:18:00 -0700 2018-09-21 09:25:35 -0700 Patch bug-189684-20180917181759.patch text/plain 4888 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiYmU2NDFiMGM3NmQzZGU4 YTNkYTQxNGIxYWEzNzVlYzY0NDQyN2EuLjVjZjYyNTA2NDQ0ZjI1ZDQyMzFmODc3NjlmODc4YTY1 ZDgzNmI3YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCA2YzUwODlhZmViNWRl M2Y0ODU5Y2UxNGQwNjMxZWJjYTA3MjQwYTRkLi5hYjIxMTFlNjA0ODBmYmVjNjFhYjI4Mjk0ZWE4 ZmE5YTc3NjA3NzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNp bmNsdWRlICJXZWJzaXRlRGF0YUZldGNoT3B0aW9uLmgiCiAjaW5jbHVkZSAiV2Vic2l0ZURhdGFT dG9yZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oPgorI2lu Y2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNpbmNsdWRlIDx3dGYvQ3Jvc3NUaHJl YWRDb3BpZXIuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3 dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuaD4KQEAgLTc1OSw0MCArNzYwLDI1IEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2NraW5nU3Rh dGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBw b3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNh bGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxlciA9IFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAgcG9zdFRh c2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0KLSAgICAg ICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlvbkhhbmRs ZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAg ICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25N YWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdyYW5kZmF0 aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBwb3N0 VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9tZW1vcnlT dG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7CiAgICAgICAg IGlmIChtX3BlcnNpc3RlbnRTdG9yYWdlKQogICAgICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFn ZS0+Y2xlYXIoKTsKLSAgICAgICAgCisKICAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp PiBjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQgPSBbY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIHBv c3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICB9OwogCi0g ICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzICYm IG1fbWVtb3J5U3RvcmUpCi0gICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4 aXN0aW5nV2Vic2l0ZURhdGEoV1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJl YWQpKTsKLSAgICAgICAgZWxzZQorICAgICAgICBpZiAobV9tZW1vcnlTdG9yZSkgeworICAgICAg ICAgICAgbV9tZW1vcnlTdG9yZS0+Y2xlYXIoW3RoaXMsIHNob3VsZEdyYW5kZmF0aGVyLCBjYWxs Q29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQgPSBXVEZNb3ZlKGNhbGxDb21wbGV0aW9uSGFu ZGxlck9uTWFpblRocmVhZCldICgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGlmIChzaG91 bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzKQorICAgICAgICAgICAgICAg ICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0ZURhdGEoV1RGTW92 ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQpKTsKKyAgICAgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgICAgIGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVh ZCgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgY2FsbENv bXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkKCk7CiAgICAgfSk7CiB9Cg== 350032 2018-09-18 10:30:07 -0700 2018-09-18 14:35:15 -0700 Patch bug-189684-20180918103006.patch text/plain 5012 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI3MTYxZWRmNGY1NDhiNTVi MTEzOTYyOTcyNDE4ZjgxZTE3NWM1YjYuLmRiMTRkZWEwMTZlMGQ1Mzc3N2E5ZWZhODU3YWFhYTQ3 MTYyY2M1YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBjN2RiNjliMTVkMWQ0 OGQ3YTRkYTM3OGY5ODZjNDQ1YzAyZTMyYjM3Li4zZjQ4ZmU4NGZiOTY1MTNjNTY1OTUwZTdjMjhm MTlmN2Y1ZTU0MWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNp bmNsdWRlICJXZWJzaXRlRGF0YUZldGNoT3B0aW9uLmgiCiAjaW5jbHVkZSAiV2Vic2l0ZURhdGFT dG9yZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oPgorI2lu Y2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNpbmNsdWRlIDx3dGYvQ3Jvc3NUaHJl YWRDb3BpZXIuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3 dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuaD4KQEAgLTc1OSw0MCArNzYwLDI3IEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2NraW5nU3Rh dGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBw b3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNh bGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxlciA9IFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAgcG9zdFRh c2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0KLSAgICAg ICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlvbkhhbmRs ZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAg ICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25N YWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdyYW5kZmF0 aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBwb3N0 VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9tZW1vcnlT dG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7CiAgICAgICAg IGlmIChtX3BlcnNpc3RlbnRTdG9yYWdlKQogICAgICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFn ZS0+Y2xlYXIoKTsKLSAgICAgICAgCisKICAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp PiBjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQgPSBbY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIHBv c3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICB9OwogCi0g ICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzICYm IG1fbWVtb3J5U3RvcmUpCi0gICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4 aXN0aW5nV2Vic2l0ZURhdGEoV1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJl YWQpKTsKLSAgICAgICAgZWxzZQorICAgICAgICBpZiAobV9tZW1vcnlTdG9yZSkgeworICAgICAg ICAgICAgbV9tZW1vcnlTdG9yZS0+Y2xlYXIoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKSwgc2hvdWxkR3JhbmRmYXRoZXIsIGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRo cmVhZCA9IFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkKV0gKCkgbXV0 YWJsZSB7CisgICAgICAgICAgICAgICAgaWYgKHNob3VsZEdyYW5kZmF0aGVyID09IFNob3VsZEdy YW5kZmF0aGVyOjpZZXMpIHsKKyAgICAgICAgICAgICAgICAgICAgQVNTRVJUKG1fbWVtb3J5U3Rv cmUpOworICAgICAgICAgICAgICAgICAgICBpZiAobV9tZW1vcnlTdG9yZSkKKyAgICAgICAgICAg ICAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0 YShXVEZNb3ZlKGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCkpOworICAgICAgICAg ICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICBjYWxsQ29tcGxldGlvbkhhbmRsZXJP bk1haW5UaHJlYWQoKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9IGVsc2UKICAgICAgICAg ICAgIGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCgpOwogICAgIH0pOwogfQo= 350059 2018-09-18 14:34:53 -0700 2018-09-18 17:38:26 -0700 Patch bug-189684-20180918143452.patch text/plain 5183 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI3MTYxZWRmNGY1NDhiNTVi MTEzOTYyOTcyNDE4ZjgxZTE3NWM1YjYuLmRiMTRkZWEwMTZlMGQ1Mzc3N2E5ZWZhODU3YWFhYTQ3 MTYyY2M1YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBjN2RiNjliMTVkMWQ0 OGQ3YTRkYTM3OGY5ODZjNDQ1YzAyZTMyYjM3Li4zZTI3ZjUyNTNlOTNjOTcwZTQyZDE0ZTQ4NzZj YmMxOTFiYTlkNDI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNp bmNsdWRlICJXZWJzaXRlRGF0YUZldGNoT3B0aW9uLmgiCiAjaW5jbHVkZSAiV2Vic2l0ZURhdGFT dG9yZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oPgorI2lu Y2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNpbmNsdWRlIDx3dGYvQ3Jvc3NUaHJl YWRDb3BpZXIuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3 dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuaD4KQEAgLTc1OSw0MCArNzYwLDI5IEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2NraW5nU3Rh dGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBw b3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNh bGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxlciA9IFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAgcG9zdFRh c2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0KLSAgICAg ICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlvbkhhbmRs ZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAg ICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25N YWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdyYW5kZmF0 aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBwb3N0 VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9tZW1vcnlT dG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7CiAgICAgICAg IGlmIChtX3BlcnNpc3RlbnRTdG9yYWdlKQogICAgICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFn ZS0+Y2xlYXIoKTsKLSAgICAgICAgCisKICAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp PiBjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQgPSBbY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIHBv c3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICB9OwogCi0g ICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzICYm IG1fbWVtb3J5U3RvcmUpCi0gICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4 aXN0aW5nV2Vic2l0ZURhdGEoV1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJl YWQpKTsKLSAgICAgICAgZWxzZQorICAgICAgICBpZiAobV9tZW1vcnlTdG9yZSkgeworICAgICAg ICAgICAgbV9tZW1vcnlTdG9yZS0+Y2xlYXIoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKSwgc2hvdWxkR3JhbmRmYXRoZXIsIGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRo cmVhZCA9IFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkKV0gKCkgbXV0 YWJsZSB7CisgICAgICAgICAgICAgICAgaWYgKHNob3VsZEdyYW5kZmF0aGVyID09IFNob3VsZEdy YW5kZmF0aGVyOjpZZXMpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKG1fbWVtb3J5U3RvcmUp CisgICAgICAgICAgICAgICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4aXN0 aW5nV2Vic2l0ZURhdGEoV1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQp KTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgUkVM RUFTRV9MT0coUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgIldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6c2NoZWR1bGVDbGVhckluTWVtb3J5QW5kUGVyc2lzdGVudCBtX21lbW9yeVN0b3Jl IGlzIG51bGwgd2hlbiB0cnlpbmcgdG8gZ3JhbmRmYXRoZXIgZGF0YS4iKTsKKworICAgICAgICAg ICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICBjYWxsQ29tcGxldGlvbkhhbmRsZXJP bk1haW5UaHJlYWQoKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9IGVsc2UKICAgICAgICAg ICAgIGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCgpOwogICAgIH0pOwogfQo= 350082 2018-09-18 17:39:13 -0700 2018-09-19 10:14:56 -0700 Patch bug-189684-20180918173912.patch text/plain 5541 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhZTZkNzhhYmM2OGQxMzAw MWI4NjMwMDM1ZGYwZWNkMGRjZWFmNWIuLjNhMGNkZTQxZTIxZDU1ZmY5YjMxZjNkOTgxODFjOWJi ZjYwNzUwYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBjN2RiNjliMTVkMWQ0 OGQ3YTRkYTM3OGY5ODZjNDQ1YzAyZTMyYjM3Li44ODNhMTEwNWRiOGQyODE2ZGU1OTE5NzhlOTc2 Yjk5MjZhNDJlMzlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNp bmNsdWRlICJXZWJzaXRlRGF0YUZldGNoT3B0aW9uLmgiCiAjaW5jbHVkZSAiV2Vic2l0ZURhdGFT dG9yZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oPgorI2lu Y2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNpbmNsdWRlIDx3dGYvQ3Jvc3NUaHJl YWRDb3BpZXIuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3 dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuaD4KQEAgLTc1OSw0MSArNzYwLDMzIEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2NraW5nU3Rh dGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBw b3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNh bGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxlciA9IFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAgcG9zdFRh c2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0KLSAgICAg ICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlvbkhhbmRs ZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAg ICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25N YWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdyYW5kZmF0 aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBwb3N0 VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9tZW1vcnlT dG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7CiAgICAgICAg IGlmIChtX3BlcnNpc3RlbnRTdG9yYWdlKQogICAgICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFn ZS0+Y2xlYXIoKTsKLSAgICAgICAgCisKICAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp PiBjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQgPSBbY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIHBv c3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICB9OwogCi0g ICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzICYm IG1fbWVtb3J5U3RvcmUpCi0gICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4 aXN0aW5nV2Vic2l0ZURhdGEoV1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJl YWQpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgY2FsbENvbXBsZXRpb25IYW5kbGVyT25N YWluVGhyZWFkKCk7CisgICAgICAgIGlmIChtX21lbW9yeVN0b3JlKSB7CisgICAgICAgICAgICBt X21lbW9yeVN0b3JlLT5jbGVhcihbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp LCBzaG91bGRHcmFuZGZhdGhlciwgY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkID0g V1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQpXSAoKSBtdXRhYmxlIHsK KyAgICAgICAgICAgICAgICBpZiAoc2hvdWxkR3JhbmRmYXRoZXIgPT0gU2hvdWxkR3JhbmRmYXRo ZXI6OlllcykgeworICAgICAgICAgICAgICAgICAgICBpZiAobV9tZW1vcnlTdG9yZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJz aXRlRGF0YShXVEZNb3ZlKGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCkpOworICAg ICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xP RyhSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCAiV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50IEFmdGVyIGJlaW5nIGNsZWFyZWQs IG1fbWVtb3J5U3RvcmUgaXMgbnVsbCB3aGVuIHRyeWluZyB0byBncmFuZGZhdGhlciBkYXRhLiIp OworCisgICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgIGNhbGxDb21w bGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgaWYgKHNob3VsZEdyYW5kZmF0aGVyID09IFNob3VsZEdyYW5kZmF0 aGVyOjpZZXMpCisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coUmVzb3VyY2VMb2FkU3RhdGlz dGljcywgIldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2NoZWR1bGVDbGVhckluTWVt b3J5QW5kUGVyc2lzdGVudCBCZWZvcmUgYmVpbmcgY2xlYXJlZCwgbV9tZW1vcnlTdG9yZSBpcyBu dWxsIHdoZW4gdHJ5aW5nIHRvIGdyYW5kZmF0aGVyIGRhdGEuIik7CisgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkKCk7CiAg ICAgfSk7CiB9CiAK 350130 2018-09-19 10:18:22 -0700 2018-09-19 14:32:50 -0700 Patch bug-189684-20180919101822.patch text/plain 5219 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhZTZkNzhhYmM2OGQxMzAw MWI4NjMwMDM1ZGYwZWNkMGRjZWFmNWIuLjNhMGNkZTQxZTIxZDU1ZmY5YjMxZjNkOTgxODFjOWJi ZjYwNzUwYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBjN2RiNjliMTVkMWQ0 OGQ3YTRkYTM3OGY5ODZjNDQ1YzAyZTMyYjM3Li5iOGQ0MDY2NGZmZTE1YWE5YjljOGQ3NjUyNTBk YjY4MzdhMWYwYjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTc1OSw0MSArNzU5LDMxIEBA IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2Nr aW5nU3RhdGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYgY29tcGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsK LSAgICBwb3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KCk+IGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAg cG9zdFRhc2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0K LSAgICAgICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlv bkhhbmRsZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot Ci0gICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5k bGVyT25NYWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdy YW5kZmF0aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAg ICBwb3N0VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0g V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9t ZW1vcnlTdG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7CiAg ICAgICAgIGlmIChtX3BlcnNpc3RlbnRTdG9yYWdlKQogICAgICAgICAgICAgbV9wZXJzaXN0ZW50 U3RvcmFnZS0+Y2xlYXIoKTsKLSAgICAgICAgCisKICAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZCgpPiBjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQgPSBbY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAg ICAgIHBvc3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICB9 OwotCi0gICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6 WWVzICYmIG1fbWVtb3J5U3RvcmUpCi0gICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZh dGhlckV4aXN0aW5nV2Vic2l0ZURhdGEoV1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1h aW5UaHJlYWQpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgY2FsbENvbXBsZXRpb25IYW5k bGVyT25NYWluVGhyZWFkKCk7CisgICAgICAgIENvbXBsZXRpb25IYW5kbGVyQ2FsbGluZ1Njb3Bl IGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5kbGVyT25N YWluVGhyZWFkKSk7CisKKyAgICAgICAgaWYgKG1fbWVtb3J5U3RvcmUpIHsKKyAgICAgICAgICAg IG1fbWVtb3J5U3RvcmUtPmNsZWFyKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyksIHNob3VsZEdyYW5kZmF0aGVyLCBjb21wbGV0aW9uSGFuZGxlckNhbGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXJDYWxsZXIpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBp ZiAoc2hvdWxkR3JhbmRmYXRoZXIgPT0gU2hvdWxkR3JhbmRmYXRoZXI6OlllcykgeworICAgICAg ICAgICAgICAgICAgICBpZiAobV9tZW1vcnlTdG9yZSkKKyAgICAgICAgICAgICAgICAgICAgICAg IG1fbWVtb3J5U3RvcmUtPmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YShjb21wbGV0aW9u SGFuZGxlckNhbGxlci5yZWxlYXNlKCkpOworICAgICAgICAgICAgICAgICAgICBlbHNlCisgICAg ICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPRyhSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCAi V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQ ZXJzaXN0ZW50IEFmdGVyIGJlaW5nIGNsZWFyZWQsIG1fbWVtb3J5U3RvcmUgaXMgbnVsbCB3aGVu IHRyeWluZyB0byBncmFuZGZhdGhlciBkYXRhLiIpOworICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIH0pOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaWYgKHNob3VsZEdyYW5k ZmF0aGVyID09IFNob3VsZEdyYW5kZmF0aGVyOjpZZXMpCisgICAgICAgICAgICAgICAgUkVMRUFT RV9MT0coUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgIldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c2NoZWR1bGVDbGVhckluTWVtb3J5QW5kUGVyc2lzdGVudCBCZWZvcmUgYmVpbmcgY2xl YXJlZCwgbV9tZW1vcnlTdG9yZSBpcyBudWxsIHdoZW4gdHJ5aW5nIHRvIGdyYW5kZmF0aGVyIGRh dGEuIik7CisgICAgICAgIH0KICAgICB9KTsKIH0KIAo= 350147 2018-09-19 13:27:42 -0700 2018-09-19 15:08:31 -0700 Patch bug-189684-20180919132742.patch text/plain 5361 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhZTZkNzhhYmM2OGQxMzAw MWI4NjMwMDM1ZGYwZWNkMGRjZWFmNWIuLjNhMGNkZTQxZTIxZDU1ZmY5YjMxZjNkOTgxODFjOWJi ZjYwNzUwYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBjN2RiNjliMTVkMWQ0 OGQ3YTRkYTM3OGY5ODZjNDQ1YzAyZTMyYjM3Li4zMTA5MDU0NGRiYTJmZGJmMzJiZGE3YmE2MWM5 ODgzNjI4MmJmZjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTc1OSw0MSArNzU5LDMxIEBA IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2Nr aW5nU3RhdGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYgY29tcGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsK LSAgICBwb3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KCk+IGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAg cG9zdFRhc2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0K LSAgICAgICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlv bkhhbmRsZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot Ci0gICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5k bGVyT25NYWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdy YW5kZmF0aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAg ICBwb3N0VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0g V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9t ZW1vcnlTdG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7Cisg ICAgcG9zdFRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgc2hvdWxk R3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl cildICgpIG11dGFibGUgewogICAgICAgICBpZiAobV9wZXJzaXN0ZW50U3RvcmFnZSkKICAgICAg ICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UtPmNsZWFyKCk7Ci0gICAgICAgIAorCiAgICAgICAg IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4gY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhy ZWFkID0gW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkg bXV0YWJsZSB7CiAgICAgICAgICAgICBwb3N0VGFza1JlcGx5KFdURk1vdmUoY29tcGxldGlvbkhh bmRsZXIpKTsKICAgICAgICAgfTsKLQotICAgICAgICBpZiAoc2hvdWxkR3JhbmRmYXRoZXIgPT0g U2hvdWxkR3JhbmRmYXRoZXI6OlllcyAmJiBtX21lbW9yeVN0b3JlKQotICAgICAgICAgICAgbV9t ZW1vcnlTdG9yZS0+Z3JhbmRmYXRoZXJFeGlzdGluZ1dlYnNpdGVEYXRhKFdURk1vdmUoY2FsbENv bXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAg IGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCgpOworICAgICAgICBDb21wbGV0aW9u SGFuZGxlckNhbGxpbmdTY29wZSBjb21wbGV0aW9uSGFuZGxlckNhbGxlcihXVEZNb3ZlKGNhbGxD b21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCkpOworCisgICAgICAgIGlmIChtX21lbW9yeVN0 b3JlKSB7CisgICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5jbGVhcihbdGhpcywgcHJvdGVjdGVk VGhpcyA9IHByb3RlY3RlZFRoaXMuY29weVJlZigpLCBzaG91bGRHcmFuZGZhdGhlciwgY29tcGxl dGlvbkhhbmRsZXJDYWxsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyKV0gKCkg bXV0YWJsZSB7CisgICAgICAgICAgICAgICAgaWYgKHNob3VsZEdyYW5kZmF0aGVyID09IFNob3Vs ZEdyYW5kZmF0aGVyOjpZZXMpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKG1fbWVtb3J5U3Rv cmUpCisgICAgICAgICAgICAgICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4 aXN0aW5nV2Vic2l0ZURhdGEoY29tcGxldGlvbkhhbmRsZXJDYWxsZXIucmVsZWFzZSgpKTsKKyAg ICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9M T0coUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgIldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6c2NoZWR1bGVDbGVhckluTWVtb3J5QW5kUGVyc2lzdGVudCBBZnRlciBiZWluZyBjbGVhcmVk LCBtX21lbW9yeVN0b3JlIGlzIG51bGwgd2hlbiB0cnlpbmcgdG8gZ3JhbmRmYXRoZXIgZGF0YS4i KTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6 WWVzKQorICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HKFJlc291cmNlTG9hZFN0YXRpc3RpY3Ms ICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFu ZFBlcnNpc3RlbnQgQmVmb3JlIGJlaW5nIGNsZWFyZWQsIG1fbWVtb3J5U3RvcmUgaXMgbnVsbCB3 aGVuIHRyeWluZyB0byBncmFuZGZhdGhlciBkYXRhLiIpOworICAgICAgICB9CiAgICAgfSk7CiB9 CiAK 350151 2018-09-19 15:08:17 -0700 2018-09-21 09:25:30 -0700 Patch bug-189684-20180919150816.patch text/plain 5388 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhZTZkNzhhYmM2OGQxMzAw MWI4NjMwMDM1ZGYwZWNkMGRjZWFmNWIuLjNhMGNkZTQxZTIxZDU1ZmY5YjMxZjNkOTgxODFjOWJi ZjYwNzUwYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDktMTcgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29u c2lzdGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KToKKworICAgICAgICBS ZW1vdmUgZnVuY3Rpb24gb25seSBjYWxsZWQgaW4gdGVzdGluZyBmb3IgcmVzZXR0aW5nIHN0YXRp c3RpY3MgdG8gY29uc2lzdGVudAorICAgICAgICBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1l bW9yeSk6IERlbGV0ZWQuCisKIDIwMTgtMDktMTQgIFdvb2Ryb3cgV2FuZyAgPHdvb2Ryb3dfd2Fu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgcGVuZGluZyByZXNvdXJjZSBsb2FkIHN0YXRp c3RpY3MnIHdyaXRlcyBhZnRlciB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKaW5kZXggN2YyM2U5MGZmN2M2 ZTJjZTRkNTQ3OTJjNjRhMGI5NjIzZjJlZmU4My4uNmVmM2JmNjU2MDM1OGRjZDc3YTJmNTQyZjQz NmI0NjM2NTliYjQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC00NzYsNyArNDc2LDcgQEAgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlzdGljc1N0b3Jl LT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNh bGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7Ci0gICAgc3RhdGlzdGljc1N0b3JlLT5z Y2hlZHVsZUNsZWFySW5NZW1vcnkoW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVn YXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgc3RhdGlzdGljc1N0b3JlLT5zY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpTaG91bGRHcmFuZGZhdGhlcjo6Tm8sIFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBjYWxsYmFj a0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogfQogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVJlbW92ZUFsbEZldGNoQ2FjaGVzKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IHZvaWQqIGNvbnRleHQsIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVSZW1vdmFs RnVuY3Rpb24gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBjN2RiNjliMTVkMWQ0 OGQ3YTRkYTM3OGY5ODZjNDQ1YzAyZTMyYjM3Li5kMmQ3YWM0YjAzZmJhYjlmOThiNDY5ZDlmMjEw OTIzZDBmYzRmOGY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTc1OSw0MSArNzU5LDMwIEBA IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNvb2tpZUJsb2Nr aW5nU3RhdGVSZXNldCgpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYgY29tcGxldGlvbkhhbmRsZXIpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsK LSAgICBwb3N0VGFzayhbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLQotICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KCk+IGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCA9IFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAgICAgICAg cG9zdFRhc2tSZXBseShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07Ci0K LSAgICAgICAgaWYgKCFtX21lbW9yeVN0b3JlKSB7Ci0gICAgICAgICAgICBjYWxsQ29tcGxldGlv bkhhbmRsZXJPbk1haW5UaHJlYWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot Ci0gICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFdURk1vdmUoY2FsbENvbXBsZXRpb25IYW5k bGVyT25NYWluVGhyZWFkKSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzY2hlZHVsZUNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50KFNob3VsZEdy YW5kZmF0aGVyIHNob3VsZEdyYW5kZmF0aGVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAg ICBwb3N0VGFzayhbdGhpcywgc2hvdWxkR3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0g V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICBpZiAobV9t ZW1vcnlTdG9yZSkKLSAgICAgICAgICAgIG1fbWVtb3J5U3RvcmUtPmNsZWFyKFtdIHsgfSk7Cisg ICAgcG9zdFRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgc2hvdWxk R3JhbmRmYXRoZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl cildICgpIG11dGFibGUgewogICAgICAgICBpZiAobV9wZXJzaXN0ZW50U3RvcmFnZSkKICAgICAg ICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UtPmNsZWFyKCk7Ci0gICAgICAgIAotICAgICAgICBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVh ZCA9IFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11 dGFibGUgeworCisgICAgICAgIENvbXBsZXRpb25IYW5kbGVyQ2FsbGluZ1Njb3BlIGNvbXBsZXRp b25IYW5kbGVyQ2FsbGVyKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhh bmRsZXIpXSgpIG11dGFibGUgewogICAgICAgICAgICAgcG9zdFRhc2tSZXBseShXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgICAgIH07CisgICAgICAgIH0pOwogCi0gICAgICAgIGlm IChzaG91bGRHcmFuZGZhdGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzICYmIG1fbWVtb3J5 U3RvcmUpCi0gICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4aXN0aW5nV2Vi c2l0ZURhdGEoV1RGTW92ZShjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQpKTsKLSAg ICAgICAgZWxzZQotICAgICAgICAgICAgY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFk KCk7CisgICAgICAgIGlmIChtX21lbW9yeVN0b3JlKSB7CisgICAgICAgICAgICBtX21lbW9yeVN0 b3JlLT5jbGVhcihbdGhpcywgcHJvdGVjdGVkVGhpcyA9IHByb3RlY3RlZFRoaXMuY29weVJlZigp LCBzaG91bGRHcmFuZGZhdGhlciwgY29tcGxldGlvbkhhbmRsZXJDYWxsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyQ2FsbGVyKV0gKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgaWYg KHNob3VsZEdyYW5kZmF0aGVyID09IFNob3VsZEdyYW5kZmF0aGVyOjpZZXMpIHsKKyAgICAgICAg ICAgICAgICAgICAgaWYgKG1fbWVtb3J5U3RvcmUpCisgICAgICAgICAgICAgICAgICAgICAgICBt X21lbW9yeVN0b3JlLT5ncmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0ZURhdGEoY29tcGxldGlvbkhh bmRsZXJDYWxsZXIucmVsZWFzZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAg ICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgIldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2NoZWR1bGVDbGVhckluTWVtb3J5QW5kUGVy c2lzdGVudCBBZnRlciBiZWluZyBjbGVhcmVkLCBtX21lbW9yeVN0b3JlIGlzIG51bGwgd2hlbiB0 cnlpbmcgdG8gZ3JhbmRmYXRoZXIgZGF0YS4iKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICB9KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmIChzaG91bGRHcmFuZGZh dGhlciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzKQorICAgICAgICAgICAgICAgIFJFTEVBU0Vf TE9HKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFuZFBlcnNpc3RlbnQgQmVmb3JlIGJlaW5nIGNsZWFy ZWQsIG1fbWVtb3J5U3RvcmUgaXMgbnVsbCB3aGVuIHRyeWluZyB0byBncmFuZGZhdGhlciBkYXRh LiIpOworICAgICAgICB9CiAgICAgfSk7CiB9CiAK 350279 2018-09-20 16:43:29 -0700 2018-09-21 09:17:26 -0700 Patch bug-189684-20180920164328.patch text/plain 8726 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDViOWFkM2Q5NDk0YWI4MTMw ZmJkZWQ5NDYyNTc1MzZhYTIwOTQ2MDUuLmM4NWJmNzhkZWRkNDRjNTQ1MGNkYmZhNDU5MGY3YmM4 N2FhOGJmNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTgtMDktMjAgIFdvb2Ryb3cg V2FuZyAgPHdvb2Ryb3dfd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgcGVyc2lzdGVu dCBzdG9yYWdlIGJldHdlZW4gdGVzdHMgZm9yIHJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY4NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDQ1NDAwOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMg RHVtZXouCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVm LmNwcDoKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRpc3RpY3NSZXNldFRvQ29uc2lz dGVudFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1By b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6ZGlkQ2xvc2Up OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5Ojp1cGRhdGVQcmV2YWxlbnRE b21haW5zVG9CbG9ja0Nvb2tpZXNGb3IpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFuZFBlcnNpc3RlbnQpOgor CisgICAgICAgIFJlbW92ZSBmdW5jdGlvbiBvbmx5IGNhbGxlZCBpbiB0ZXN0aW5nIGZvciByZXNl dHRpbmcgc3RhdGlzdGljcyB0byBjb25zaXN0ZW50CisgICAgICAgIHN0YXRlLiAKKworICAgICAg ICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJ bk1lbW9yeSk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnVw ZGF0ZVByZXZhbGVudERvbWFpbnNUb0Jsb2NrQ29va2llc0Zvcik6CisgICAgICAgIChXZWJLaXQ6 OldlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZUFsbFN0b3JhZ2VBY2Nlc3NIYW5kbGVyKToKKwogMjAx OC0wOS0xNCAgV29vZHJvdyBXYW5nICA8d29vZHJvd193YW5nQGFwcGxlLmNvbT4KIAogICAgICAg ICBDbGVhciBwZW5kaW5nIHJlc291cmNlIGxvYWQgc3RhdGlzdGljcycgd3JpdGVzIGFmdGVyIHRl c3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVE YXRhU3RvcmVSZWYuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRl RGF0YVN0b3JlUmVmLmNwcAppbmRleCAyNDY0YjBiZGE0NTZkYTViOWZkZTI5YmUwMWI5YWVlZTVk YjZlMDY2Li4wZWYyOTQ0MzY4OTgwMzk2ZWJlM2UwYzFiZjMxMmI2MGNjMDRiMmZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9y ZVJlZi5jcHAKQEAgLTQ4NCw3ICs0ODQsNyBAQCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVN0YXRp c3RpY3NSZXNldFRvQ29uc2lzdGVudFN0YXRlKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYQogICAg ICAgICByZXR1cm47CiAKICAgICBzdGF0aXN0aWNzU3RvcmUtPnJlc2V0UGFyYW1ldGVyc1RvRGVm YXVsdFZhbHVlcyhbY2FsbGJhY2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlS ZWYoKV0geyB9KTsKLSAgICBzdGF0aXN0aWNzU3RvcmUtPnNjaGVkdWxlQ2xlYXJJbk1lbW9yeShb Y2FsbGJhY2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9KTsK KyAgICBzdGF0aXN0aWNzU3RvcmUtPnNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFuZFBlcnNpc3RlbnQo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlNob3VsZEdyYW5kZmF0aGVy OjpObywgW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCld IHsgfSk7CiB9CiAKIHZvaWQgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxsRmV0Y2hDYWNoZXMo V0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZiwgdm9pZCogY29udGV4dCwgV0tXZWJz aXRlRGF0YVN0b3JlUmVtb3ZlRmV0Y2hDYWNoZVJlbW92YWxGdW5jdGlvbiBjYWxsYmFjaykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkuY3BwCmluZGV4IDRlOTkxOTM0OWJlZTU5YTE4N2E3OWI1NmQ4YzJkMzQ5ZDUzNDA4YjYu LjgxMGRhZjkxZDRjMzI1OGUwZTMzMDA0YWYyMDBlZDM4ZWJlOTY3YzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNw cApAQCAtMjY1LDYgKzI2NSwxNCBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OmRpZENsb3Nl KElQQzo6Q29ubmVjdGlvbiYpCiAgICAgICAgIGNhbGxiYWNrKGZhbHNlKTsKICAgICBtX3dyaXRl QmxvYlRvRmlsZVBhdGhDYWxsYmFja01hcC5jbGVhcigpOwogCisgICAgZm9yIChhdXRvJiBjYWxs YmFjayA6IG1fcmVtb3ZlQWxsU3RvcmFnZUFjY2Vzc0NhbGxiYWNrTWFwLnZhbHVlcygpKQorICAg ICAgICBjYWxsYmFjaygpOworICAgIG1fcmVtb3ZlQWxsU3RvcmFnZUFjY2Vzc0NhbGxiYWNrTWFw LmNsZWFyKCk7CisKKyAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogbV91cGRhdGVCbG9ja0Nvb2tp ZXNDYWxsYmFja01hcC52YWx1ZXMoKSkKKyAgICAgICAgY2FsbGJhY2soKTsKKyAgICBtX3VwZGF0 ZUJsb2NrQ29va2llc0NhbGxiYWNrTWFwLmNsZWFyKCk7CisgICAgCiAgICAgLy8gVGhpcyBtYXkg Y2F1c2UgdXMgdG8gYmUgZGVsZXRlZC4KICAgICBuZXR3b3JrUHJvY2Vzc0NyYXNoZWQoKTsKIH0K QEAgLTM5Miw3ICs0MDAsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnVwZGF0ZVByZXZh bGVudERvbWFpbnNUb0Jsb2NrQ29va2llc0ZvcihQQUw6OlNlc3Npb25JRAogICAgIH0KICAgICAK ICAgICBhdXRvIGNhbGxiYWNrSWQgPSBnZW5lcmF0ZUNhbGxiYWNrSUQoKTsKLSAgICBhdXRvIGFk ZFJlc3VsdCA9IG1fdXBkYXRlQmxvY2tDb29raWVzQ2FsbGJhY2tNYXAuYWRkKGNhbGxiYWNrSWQs IFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHRva2VuID0gdGhyb3R0bGVyKCkuYmFj a2dyb3VuZEFjdGl2aXR5VG9rZW4oKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICBhdXRvIGFkZFJlc3VsdCA9IG1fdXBkYXRl QmxvY2tDb29raWVzQ2FsbGJhY2tNYXAuYWRkKGNhbGxiYWNrSWQsIFtwcm90ZWN0ZWRQcm9jZXNz UG9vbCA9IG1ha2VSZWYobV9wcm9jZXNzUG9vbCksIHRva2VuID0gdGhyb3R0bGVyKCkuYmFja2dy b3VuZEFjdGl2aXR5VG9rZW4oKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKICAg ICB9KTsKICAgICBBU1NFUlRfVU5VU0VEKGFkZFJlc3VsdCwgYWRkUmVzdWx0LmlzTmV3RW50cnkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggMTFiZTA0NTcyZjJlNWIxNWUzMjMwNDliZDVkZWIy MDMwNjgyMmRkNC4uZmE1ZWYyMTUyNGJjODQ1OTZjOGZkMjg0ZTVhMTZmNjgyNTYwYWY3MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuY3BwCkBAIC03NTksNDEgKzc1OSwzMCBAQCB2b2lkIFdlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6c2NoZWR1bGVDb29raWVCbG9ja2luZ1N0YXRlUmVzZXQoKQog fQogI2VuZGlmCiAKLXZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVs ZUNsZWFySW5NZW1vcnkoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5k bGVyKQotewotICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7Ci0gICAgcG9zdFRhc2soW3Ro aXMsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0 YWJsZSB7Ci0KLSAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiBjYWxsQ29tcGxldGlv bkhhbmRsZXJPbk1haW5UaHJlYWQgPSBbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIHBvc3RUYXNrUmVwbHkoV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwotICAgICAgICB9OwotCi0gICAgICAgIGlmICghbV9t ZW1vcnlTdG9yZSkgewotICAgICAgICAgICAgY2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhy ZWFkKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBtX21lbW9y eVN0b3JlLT5jbGVhcihXVEZNb3ZlKGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCkp OwotICAgIH0pOwotfQotCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2No ZWR1bGVDbGVhckluTWVtb3J5QW5kUGVyc2lzdGVudChTaG91bGRHcmFuZGZhdGhlciBzaG91bGRH cmFuZGZhdGhlciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7Ci0gICAgcG9zdFRhc2soW3RoaXMs IHNob3VsZEdyYW5kZmF0aGVyLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpXSAoKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKG1fbWVtb3J5U3RvcmUpCi0gICAg ICAgICAgICBtX21lbW9yeVN0b3JlLT5jbGVhcihbXSB7IH0pOworICAgIHBvc3RUYXNrKFt0aGlz LCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHNob3VsZEdyYW5kZmF0aGVyLCBjb21w bGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoKSBtdXRhYmxlIHsK ICAgICAgICAgaWYgKG1fcGVyc2lzdGVudFN0b3JhZ2UpCiAgICAgICAgICAgICBtX3BlcnNpc3Rl bnRTdG9yYWdlLT5jbGVhcigpOwotICAgICAgICAKLSAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZCgpPiBjYWxsQ29tcGxldGlvbkhhbmRsZXJPbk1haW5UaHJlYWQgPSBbY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKworICAgICAg ICBDb21wbGV0aW9uSGFuZGxlckNhbGxpbmdTY29wZSBjb21wbGV0aW9uSGFuZGxlckNhbGxlcihb Y29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxl IHsKICAgICAgICAgICAgIHBvc3RUYXNrUmVwbHkoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikp OwotICAgICAgICB9OworICAgICAgICB9KTsKIAotICAgICAgICBpZiAoc2hvdWxkR3JhbmRmYXRo ZXIgPT0gU2hvdWxkR3JhbmRmYXRoZXI6OlllcyAmJiBtX21lbW9yeVN0b3JlKQotICAgICAgICAg ICAgbV9tZW1vcnlTdG9yZS0+Z3JhbmRmYXRoZXJFeGlzdGluZ1dlYnNpdGVEYXRhKFdURk1vdmUo Y2FsbENvbXBsZXRpb25IYW5kbGVyT25NYWluVGhyZWFkKSk7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIGNhbGxDb21wbGV0aW9uSGFuZGxlck9uTWFpblRocmVhZCgpOworICAgICAgICBpZiAo bV9tZW1vcnlTdG9yZSkgeworICAgICAgICAgICAgbV9tZW1vcnlTdG9yZS0+Y2xlYXIoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBwcm90ZWN0ZWRUaGlzLmNvcHlSZWYoKSwgc2hvdWxkR3JhbmRmYXRo ZXIsIGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlckNh bGxlcildICgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGlmIChzaG91bGRHcmFuZGZhdGhl ciA9PSBTaG91bGRHcmFuZGZhdGhlcjo6WWVzKSB7CisgICAgICAgICAgICAgICAgICAgIGlmICht X21lbW9yeVN0b3JlKQorICAgICAgICAgICAgICAgICAgICAgICAgbV9tZW1vcnlTdG9yZS0+Z3Jh bmRmYXRoZXJFeGlzdGluZ1dlYnNpdGVEYXRhKGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyLnJlbGVh c2UoKSk7CisgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAg IFJFTEVBU0VfTE9HKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsICJXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OnNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFuZFBlcnNpc3RlbnQgQWZ0ZXIgYmVp bmcgY2xlYXJlZCwgbV9tZW1vcnlTdG9yZSBpcyBudWxsIHdoZW4gdHJ5aW5nIHRvIGdyYW5kZmF0 aGVyIGRhdGEuIik7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSk7CisgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICBpZiAoc2hvdWxkR3JhbmRmYXRoZXIgPT0gU2hvdWxkR3Jh bmRmYXRoZXI6OlllcykKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0xPRyhSZXNvdXJjZUxvYWRT dGF0aXN0aWNzLCAiV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzY2hlZHVsZUNsZWFy SW5NZW1vcnlBbmRQZXJzaXN0ZW50IEJlZm9yZSBiZWluZyBjbGVhcmVkLCBtX21lbW9yeVN0b3Jl IGlzIG51bGwgd2hlbiB0cnlpbmcgdG8gZ3JhbmRmYXRoZXIgZGF0YS4iKTsKKyAgICAgICAgfQog ICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IDMwODcxOGFhNGFhMzVhMGIyZjcyMTJl ZDAxYjczNzFmZDJiZjc0MzUuLjM2YWFlNWJhZTdlYjk3NmQ3MzhlMzliNjhiOWI1MjNhYTE3YjRm ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xMjU1LDcgKzEyNTUsNyBAQCB2b2lkIFdlYnNpdGVE YXRhU3RvcmU6OnVwZGF0ZVByZXZhbGVudERvbWFpbnNUb0Jsb2NrQ29va2llc0Zvcihjb25zdCBW ZWN0b3I8U3RyaQogCiAgICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygp KSB7CiAgICAgICAgIGlmIChhdXRvKiBwcm9jZXNzID0gcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9j ZXNzKCkpCi0gICAgICAgICAgICBwcm9jZXNzLT51cGRhdGVQcmV2YWxlbnREb21haW5zVG9CbG9j a0Nvb2tpZXNGb3IobV9zZXNzaW9uSUQsIGRvbWFpbnNUb0Jsb2NrLCBzaG91bGRDbGVhckZpcnN0 LCBbY2FsbGJhY2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9 KTsKKyAgICAgICAgICAgIHByb2Nlc3MtPnVwZGF0ZVByZXZhbGVudERvbWFpbnNUb0Jsb2NrQ29v a2llc0ZvcihtX3Nlc3Npb25JRCwgZG9tYWluc1RvQmxvY2ssIHNob3VsZENsZWFyRmlyc3QsIFtw cm9jZXNzUG9vbCwgY2FsbGJhY2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlS ZWYoKV0geyB9KTsKICAgICB9CiB9CiAKQEAgLTEzMDEsNyArMTMwMSw3IEBAIHZvaWQgV2Vic2l0 ZURhdGFTdG9yZTo6cmVtb3ZlQWxsU3RvcmFnZUFjY2Vzc0hhbmRsZXIoQ29tcGxldGlvbkhhbmRs ZXI8dm9pZCgpPiYmCiAgICAgCiAgICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQ b29scygpKSB7CiAgICAgICAgIGlmIChhdXRvIG5ldHdvcmtQcm9jZXNzID0gcHJvY2Vzc1Bvb2wt Pm5ldHdvcmtQcm9jZXNzKCkpCi0gICAgICAgICAgICBuZXR3b3JrUHJvY2Vzcy0+cmVtb3ZlQWxs U3RvcmFnZUFjY2VzcyhtX3Nlc3Npb25JRCwgW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNr QWdncmVnYXRvci5jb3B5UmVmKCldIHsgfSk7CisgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzcy0+ cmVtb3ZlQWxsU3RvcmFnZUFjY2VzcyhtX3Nlc3Npb25JRCwgW3Byb2Nlc3NQb29sLCBjYWxsYmFj a0FnZ3JlZ2F0b3IgPSBjYWxsYmFja0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogICAgIH0K IH0KIAo=