189037 2018-08-27 17:15:29 -0700 Add error information to help debug test failure in WKNavigation.ProcessCrashDuringCallback 2018-08-30 11:20:21 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 189148 1 sihui_liu sihui_liu cdumez commit-queue jlewis3 lforschler realdawei ryanhaddad tsavell webkit-bug-importer oldest_to_newest 1454226 0 sihui_liu 2018-08-27 17:15:29 -0700 WKNavigation.ProcessCrashDuringCallback is failing after r235321, which seems to be an irrelevant change. Add some error information to help debug the failure. 1454228 1 348242 sihui_liu 2018-08-27 17:18:33 -0700 Created attachment 348242 Patch 1454420 2 348304 sihui_liu 2018-08-28 10:13:31 -0700 Created attachment 348304 Patch 1454482 3 cdumez 2018-08-28 11:59:47 -0700 What does the failure look like? 1454486 4 sihui_liu 2018-08-28 12:03:25 -0700 (In reply to Chris Dumez from comment #3) > What does the failure look like? https://build.webkit.org/builders/Apple%20High%20Sierra%20Debug%20WK2%20%28Tests%29/builds/4651/steps/run-api-tests/logs/stdio /Volumes/Data/slave/highsierra-debug/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm:232 Value of: !!error Actual: false Expected: true 1454488 5 348304 cdumez 2018-08-28 12:08:55 -0700 Comment on attachment 348304 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348304&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm:233 > + EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated); I believe the parameters are reversed. Left side should be expected value iirc. 1454489 6 348320 sihui_liu 2018-08-28 12:13:54 -0700 Created attachment 348320 Patch 1454490 7 sihui_liu 2018-08-28 12:16:28 -0700 (In reply to Chris Dumez from comment #5) > Comment on attachment 348304 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=348304&action=review > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm:233 > > + EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated); > > I believe the parameters are reversed. Left side should be expected value > iirc. I saw this WKContentExtensionStoreStore.mm so I thought it's correct... Fixed. 1454492 8 cdumez 2018-08-28 12:18:57 -0700 (In reply to Sihui Liu from comment #7) > (In reply to Chris Dumez from comment #5) > > Comment on attachment 348304 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=348304&action=review > > > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm:233 > > > + EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated); > > > > I believe the parameters are reversed. Left side should be expected value > > iirc. > > I saw this WKContentExtensionStoreStore.mm so I thought it's correct... > Fixed. Yes, people get it wrong all the time. 1454493 9 348320 cdumez 2018-08-28 12:21:08 -0700 Comment on attachment 348320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348320&action=review r=me > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:4576 > + NSError* callbackError = [NSError errorWithDomain:WKErrorDomain code:static_cast<int>(error) userInfo:nil]; FYI, we use star on right size for NS types. But in this case, I'd rather we drop this local variable completely: completionHandlerBlock(nil, [NSError errorWithDomain:WKErrorDomain code:static_cast<int>(error) userInfo:nil]); > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:4591 > + NSError* callbackError = [NSError errorWithDomain:WKErrorDomain code:static_cast<int>(error) userInfo:nil]; ditto. > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:4605 > + NSError* callbackError = [NSError errorWithDomain:WKErrorDomain code:static_cast<int>(error) userInfo:nil]; ditto. 1454531 10 348338 sihui_liu 2018-08-28 13:48:02 -0700 Created attachment 348338 Patch for landing 1454550 11 348338 commit-queue 2018-08-28 14:26:29 -0700 Comment on attachment 348338 Patch for landing Clearing flags on attachment: 348338 Committed r235440: <https://trac.webkit.org/changeset/235440> 1454551 12 commit-queue 2018-08-28 14:26:30 -0700 All reviewed patches have been landed. Closing bug. 1454552 13 webkit-bug-importer 2018-08-28 14:27:25 -0700 <rdar://problem/43814405> 1454992 14 ryanhaddad 2018-08-29 16:25:43 -0700 Do we now have the needed information to resolve the issue? This test is consistently failing on iOS bots. https://build.webkit.org/builders/Apple%20iOS%2011%20Simulator%20Release%20WK2%20%28Tests%29/builds/7110/steps/run-api-tests/logs/stdio 1455016 15 cdumez 2018-08-29 16:47:53 -0700 (In reply to Ryan Haddad from comment #14) > Do we now have the needed information to resolve the issue? This test is > consistently failing on iOS bots. > > https://build.webkit.org/builders/ > Apple%20iOS%2011%20Simulator%20Release%20WK2%20%28Tests%29/builds/7110/steps/ > run-api-tests/logs/stdio Probably the WebView is getting destroyed *before* we realize the WebProcess has exited. When The WebView gets destroyed, we call WebPageProxy::close() which causes error WKErrorWebViewInvalidated as we see in the new test output. 1455023 16 cdumez 2018-08-29 16:53:36 -0700 (In reply to Chris Dumez from comment #15) > (In reply to Ryan Haddad from comment #14) > > Do we now have the needed information to resolve the issue? This test is > > consistently failing on iOS bots. > > > > https://build.webkit.org/builders/ > > Apple%20iOS%2011%20Simulator%20Release%20WK2%20%28Tests%29/builds/7110/steps/ > > run-api-tests/logs/stdio > > Probably the WebView is getting destroyed *before* we realize the WebProcess > has exited. When The WebView gets destroyed, we call WebPageProxy::close() > which causes error WKErrorWebViewInvalidated as we see in the new test > output. We should probably drop this line: webView = nullptr; Not sure why I did this in the first place. 348242 2018-08-27 17:18:33 -0700 2018-08-28 10:13:30 -0700 Patch bug-189037-20180827171832.patch text/plain 6527 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY2ODkxM2I5YjUyYWFhNWZk NjY2YmE5YzBhMTkwNGRhOTg2ZGM1N2YuLmQ0ODZkYjdhZDA1NzNhZmZjZDc4N2M4Zjk1NWY4ODc3 ZjA3NDUzNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDgtMjcgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGVycm9yIGluZm9ybWF0aW9u IHRvIGhlbHAgZGVidWcgdGVzdCBmYWlsdXJlIGluIFdLTmF2aWdhdGlvbi5Qcm9jZXNzQ3Jhc2hE dXJpbmdDYWxsYmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg5MDM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tX ZWJWaWV3IF9nZXRNYWluUmVzb3VyY2VEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOl0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2dldFdlYkFyY2hpdmVEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVy Ol0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxl dGlvbkhhbmRsZXI6XSk6CisKIDIwMTgtMDgtMjYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtDb2NvYV0gQWRhcHQgbW9yZSBXZWJLaXQgY29kZSB0byBiZSBBUkMt Y29tcGF0aWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0KaW5kZXggN2I2Y2NiZTJkMGQ1YzE3ZDRmZTUyMDZhNjM2YzU2ZTUyYTY5ZTY1ZC4uMmI1 M2ZjZTFmMWVkN2EwM2FlYzA1NTRlMTUxNWVhYWJiMGIwYTY1MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NTc4LDggKzQ1NzgsOCBA QCAtICh2b2lkKV9nZXRNYWluUmVzb3VyY2VEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lk ICheKShOU0RhdGEgKiwgTlNFcnJvciAqKQogICAgICAgICB2b2lkICheY29tcGxldGlvbkhhbmRs ZXJCbG9jaykoTlNEYXRhICosIE5TRXJyb3IgKikgPSAodm9pZCAoXikoTlNEYXRhICosIE5TRXJy b3IgKikpaGFuZGxlci5nZXQoKTsKICAgICAgICAgaWYgKGVycm9yICE9IFdlYktpdDo6Q2FsbGJh Y2tCYXNlOjpFcnJvcjo6Tm9uZSkgewogICAgICAgICAgICAgLy8gRklYTUU6IFBpcGUgYSBwcm9w ZXIgZXJyb3IgaW4gZnJvbSB0aGUgV2ViUGFnZVByb3h5LgotICAgICAgICAgICAgUmV0YWluUHRy PE5TRXJyb3I+IGVycm9yID0gYWRvcHROUyhbW05TRXJyb3IgYWxsb2NdIGluaXRdKTsKLSAgICAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyQmxvY2sobmlsLCBlcnJvci5nZXQoKSk7CisgICAgICAg ICAgICBOU0Vycm9yKiBjYWxsYmFja0Vycm9yID0gW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldL RXJyb3JEb21haW4gY29kZTpzdGF0aWNfY2FzdDxpbnQ+KGVycm9yKSB1c2VySW5mbzpuaWxdOwor ICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXJCbG9jayhuaWwsIGNhbGxiYWNrRXJyb3IpOwog ICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyQmxvY2sod3JhcHBl cigqZGF0YSksIG5pbCk7CiAgICAgfSk7CkBAIC00NTkzLDggKzQ1OTMsOCBAQCAtICh2b2lkKV9n ZXRXZWJBcmNoaXZlRGF0YVdpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNEYXRhICos IE5TRXJyb3IgKikpYwogICAgICAgICB2b2lkICheY29tcGxldGlvbkhhbmRsZXJCbG9jaykoTlNE YXRhICosIE5TRXJyb3IgKikgPSAodm9pZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpaGFuZGxl ci5nZXQoKTsKICAgICAgICAgaWYgKGVycm9yICE9IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJv cjo6Tm9uZSkgewogICAgICAgICAgICAgLy8gRklYTUU6IFBpcGUgYSBwcm9wZXIgZXJyb3IgaW4g ZnJvbSB0aGUgV2ViUGFnZVByb3h5LgotICAgICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IGVy cm9yID0gYWRvcHROUyhbW05TRXJyb3IgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyQmxvY2sobmlsLCBlcnJvci5nZXQoKSk7CisgICAgICAgICAgICBOU0Vycm9y KiBjYWxsYmFja0Vycm9yID0gW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4g Y29kZTpzdGF0aWNfY2FzdDxpbnQ+KGVycm9yKSB1c2VySW5mbzpuaWxdOworICAgICAgICAgICAg Y29tcGxldGlvbkhhbmRsZXJCbG9jayhuaWwsIGNhbGxiYWNrRXJyb3IpOwogICAgICAgICB9IGVs c2UKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyQmxvY2sod3JhcHBlcigqZGF0YSksIG5p bCk7CiAgICAgfSk7CkBAIC00NjA3LDggKzQ2MDcsOCBAQCAtICh2b2lkKV9nZXRDb250ZW50c0Fz U3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU1N0cmluZyAqLCBOU0Vycm9y CiAgICAgX3BhZ2UtPmdldENvbnRlbnRzQXNTdHJpbmcoW2hhbmRsZXJdKFN0cmluZyBzdHJpbmcs IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikgewogICAgICAgICBpZiAoZXJyb3Ig IT0gV2ViS2l0OjpDYWxsYmFja0Jhc2U6OkVycm9yOjpOb25lKSB7CiAgICAgICAgICAgICAvLyBG SVhNRTogUGlwZSBhIHByb3BlciBlcnJvciBpbiBmcm9tIHRoZSBXZWJQYWdlUHJveHkuCi0gICAg ICAgICAgICBSZXRhaW5QdHI8TlNFcnJvcj4gZXJyb3IgPSBhZG9wdE5TKFtbTlNFcnJvciBhbGxv Y10gaW5pdF0pOwotICAgICAgICAgICAgaGFuZGxlcihuaWwsIGVycm9yLmdldCgpKTsKKyAgICAg ICAgICAgIE5TRXJyb3IqIGNhbGxiYWNrRXJyb3IgPSBbTlNFcnJvciBlcnJvcldpdGhEb21haW46 V0tFcnJvckRvbWFpbiBjb2RlOnN0YXRpY19jYXN0PGludD4oZXJyb3IpIHVzZXJJbmZvOm5pbF07 CisgICAgICAgICAgICBoYW5kbGVyKG5pbCwgY2FsbGJhY2tFcnJvcik7CiAgICAgICAgIH0gZWxz ZQogICAgICAgICAgICAgaGFuZGxlcihzdHJpbmcsIG5pbCk7CiAgICAgfSk7CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTViZDBhMWY0MzM4ZTc2 ZjkwOTg0OWI4YTkxNjJiMmM2ZWZhYjUzOC4uMzJhMmVlZDlkNzg4ZmVlZTk3ZDU4YmYxZjJmYjUy YjkzNmE5MjFlYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE4LTA4LTI3ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVA YXBwbGUuY29tPgorCisgICAgICAgIEFkZCBlcnJvciBpbmZvcm1hdGlvbiB0byBoZWxwIGRlYnVn IHRlc3QgZmFpbHVyZSBpbiBXS05hdmlnYXRpb24uUHJvY2Vzc0NyYXNoRHVyaW5nQ2FsbGJhY2sK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTAzNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5t bToKKyAgICAgICAgKFRFU1QpOgorCiAyMDE4LTA4LTI3ICBBbGV4IENocmlzdGVuc2VuICA8YWNo cmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVHJhbnNsYXRlIDQgdGVzdHMgdXNpbmcg V0tQYWdlTG9hZGVyQ2xpZW50IHRvIE9iakMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUubW0gYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNzRGlk VGVybWluYXRlLm1tCmluZGV4IDQwNTBlYmQzOWJmOGU0MTg3MGRhMjQ1MTY0ODM5ZTM1OTAzNDhm YTQuLjVkZjU4YmY1YzFhN2QyZDZjNDFhOGQwZjdmN2E2ZjlhMDEyY2JiZTMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NE aWRUZXJtaW5hdGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbQpAQCAtMjI5LDM4ICsyMjksNDQgQEAg VEVTVChXS05hdmlnYXRpb24sIFByb2Nlc3NDcmFzaER1cmluZ0NhbGxiYWNrKQogCiAgICAgX19i bG9jayBXS1dlYlZpZXcgKnZpZXcgPSB3ZWJWaWV3LmdldCgpOwogICAgIFt3ZWJWaWV3IF9nZXRD b250ZW50c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRz LCBOU0Vycm9yICplcnJvcikgewotICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAg ICAgaWYgKCEhZXJyb3IpCisgICAgICAgICAgICBFWFBFQ1RfRVEoZXJyb3IuY29kZSwgV0tFcnJv cldlYkNvbnRlbnRQcm9jZXNzVGVybWluYXRlZCk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsK ICAgICAgICAgaWYgKGNhbGxiYWNrQ291bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENh bGxiYWNrcyA9IHRydWU7CiAgICAgfV07CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJp bmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVy cm9yKSB7Ci0gICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJv cikKKyAgICAgICAgICAgIEVYUEVDVF9FUShlcnJvci5jb2RlLCBXS0Vycm9yV2ViQ29udGVudFBy b2Nlc3NUZXJtaW5hdGVkKTsKICAgICAgICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAo Y2FsbGJhY2tDb3VudCA9PSA2KQogICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1 ZTsKICAgICB9XTsKICAgICBbd2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0 aW9uSGFuZGxlcjpeKE5TU3RyaW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAg ICAgRVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAg ICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JXZWJDb250ZW50UHJvY2Vzc1Rlcm1pbmF0 ZWQpOwogICAgICAgICBbdmlldyBfY2xvc2VdOyAvLyBDYWxsaW5nIF9jbG9zZSB3aWxsIGFsc28g aW52YWxpZGF0ZSBhbGwgY2FsbGJhY2tzLgogICAgICAgICArK2NhbGxiYWNrQ291bnQ7CiAgICAg ICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAgICBjYWxsZWRBbGxDYWxsYmFj a3MgPSB0cnVlOwogICAgIH1dOwogICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50c0FzU3RyaW5nV2l0 aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vycm9yICplcnJvcikg ewotICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgaWYgKCEhZXJyb3IpCisg ICAgICAgICAgICBFWFBFQ1RfRVEoZXJyb3IuY29kZSwgV0tFcnJvcldlYkNvbnRlbnRQcm9jZXNz VGVybWluYXRlZCk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsKICAgICAgICAgaWYgKGNhbGxi YWNrQ291bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENhbGxiYWNrcyA9IHRydWU7CiAg ICAgfV07CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxldGlvbkhh bmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9yKSB7Ci0gICAgICAgIEVY UEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJvcikKKyAgICAgICAgICAgIEVY UEVDVF9FUShlcnJvci5jb2RlLCBXS0Vycm9yV2ViQ29udGVudFByb2Nlc3NUZXJtaW5hdGVkKTsK ICAgICAgICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAoY2FsbGJhY2tDb3VudCA9PSA2 KQogICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKICAgICB9XTsKICAgICBb d2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeKE5TU3Ry aW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAgICAgRVhQRUNUX1RSVUUoISFl cnJvcik7CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAgICAgRVhQRUNUX0VRKGVycm9y LmNvZGUsIFdLRXJyb3JXZWJDb250ZW50UHJvY2Vzc1Rlcm1pbmF0ZWQpOwogICAgICAgICArK2Nh bGxiYWNrQ291bnQ7CiAgICAgICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAg ICBjYWxsZWRBbGxDYWxsYmFja3MgPSB0cnVlOwo= 348304 2018-08-28 10:13:31 -0700 2018-08-28 12:13:53 -0700 Patch bug-189037-20180828101331.patch text/plain 6578 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2OTRlZDFiZjY3OTdhZTBh ZmMzODE0YzgzYjIwYjJmN2JmOTNiNmMuLjU4MmE0YWNhNWRjNTcyZWJkMzU2OTcyNjQ3NjEwNDZl NDg4MDc5NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDgtMjggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGVycm9yIGluZm9ybWF0aW9u IHRvIGhlbHAgZGVidWcgdGVzdCBmYWlsdXJlIGluIFdLTmF2aWdhdGlvbi5Qcm9jZXNzQ3Jhc2hE dXJpbmdDYWxsYmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg5MDM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tX ZWJWaWV3IF9nZXRNYWluUmVzb3VyY2VEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOl0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2dldFdlYkFyY2hpdmVEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVy Ol0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxl dGlvbkhhbmRsZXI6XSk6CisKIDIwMTgtMDgtMjggIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlA YXBwbGUuY29tPgogCiAgICAgICAgIFtEYXRhbGlzdF0gUHJlc3NpbmcgZW50ZXIgd2l0aG91dCBh IHNlbGVjdGVkIG9wdGlvbiBzaG91bGRuJ3QgY2hhbmdlIHRoZSBpbnB1dApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggNjllZTNkMzk2Zjhj MjY0NWQ1NDg0MGE1MzVmZTllYmMyYzVhM2ZhNy4uNGU2OTQxMmYyNzMyN2I4OWRlNWVlMjAwODk4 N2U5OTVkYzNlYjg1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC00NTczLDggKzQ1NzMsOCBAQCAtICh2b2lkKV9nZXRNYWluUmVzb3Vy Y2VEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU0RhdGEgKiwgTlNFcnJvciAq KQogICAgICAgICB2b2lkICheY29tcGxldGlvbkhhbmRsZXJCbG9jaykoTlNEYXRhICosIE5TRXJy b3IgKikgPSAodm9pZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpaGFuZGxlci5nZXQoKTsKICAg ICAgICAgaWYgKGVycm9yICE9IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkgewog ICAgICAgICAgICAgLy8gRklYTUU6IFBpcGUgYSBwcm9wZXIgZXJyb3IgaW4gZnJvbSB0aGUgV2Vi UGFnZVByb3h5LgotICAgICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IGVycm9yID0gYWRvcHRO UyhbW05TRXJyb3IgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy QmxvY2sobmlsLCBlcnJvci5nZXQoKSk7CisgICAgICAgICAgICBOU0Vycm9yKiBjYWxsYmFja0Vy cm9yID0gW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29kZTpzdGF0aWNf Y2FzdDxpbnQ+KGVycm9yKSB1c2VySW5mbzpuaWxdOworICAgICAgICAgICAgY29tcGxldGlvbkhh bmRsZXJCbG9jayhuaWwsIGNhbGxiYWNrRXJyb3IpOwogICAgICAgICB9IGVsc2UKICAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyQmxvY2sod3JhcHBlcigqZGF0YSksIG5pbCk7CiAgICAgfSk7 CkBAIC00NTg4LDggKzQ1ODgsOCBAQCAtICh2b2lkKV9nZXRXZWJBcmNoaXZlRGF0YVdpdGhDb21w bGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpYwogICAgICAgICB2 b2lkICheY29tcGxldGlvbkhhbmRsZXJCbG9jaykoTlNEYXRhICosIE5TRXJyb3IgKikgPSAodm9p ZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpaGFuZGxlci5nZXQoKTsKICAgICAgICAgaWYgKGVy cm9yICE9IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkgewogICAgICAgICAgICAg Ly8gRklYTUU6IFBpcGUgYSBwcm9wZXIgZXJyb3IgaW4gZnJvbSB0aGUgV2ViUGFnZVByb3h5Lgot ICAgICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IGVycm9yID0gYWRvcHROUyhbW05TRXJyb3Ig YWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyQmxvY2sobmlsLCBl cnJvci5nZXQoKSk7CisgICAgICAgICAgICBOU0Vycm9yKiBjYWxsYmFja0Vycm9yID0gW05TRXJy b3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29kZTpzdGF0aWNfY2FzdDxpbnQ+KGVy cm9yKSB1c2VySW5mbzpuaWxdOworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXJCbG9jayhu aWwsIGNhbGxiYWNrRXJyb3IpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGNvbXBsZXRp b25IYW5kbGVyQmxvY2sod3JhcHBlcigqZGF0YSksIG5pbCk7CiAgICAgfSk7CkBAIC00NjAyLDgg KzQ2MDIsOCBAQCAtICh2b2lkKV9nZXRDb250ZW50c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5k bGVyOih2b2lkICheKShOU1N0cmluZyAqLCBOU0Vycm9yCiAgICAgX3BhZ2UtPmdldENvbnRlbnRz QXNTdHJpbmcoW2hhbmRsZXJdKFN0cmluZyBzdHJpbmcsIFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpF cnJvciBlcnJvcikgewogICAgICAgICBpZiAoZXJyb3IgIT0gV2ViS2l0OjpDYWxsYmFja0Jhc2U6 OkVycm9yOjpOb25lKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogUGlwZSBhIHByb3BlciBlcnJv ciBpbiBmcm9tIHRoZSBXZWJQYWdlUHJveHkuCi0gICAgICAgICAgICBSZXRhaW5QdHI8TlNFcnJv cj4gZXJyb3IgPSBhZG9wdE5TKFtbTlNFcnJvciBhbGxvY10gaW5pdF0pOwotICAgICAgICAgICAg aGFuZGxlcihuaWwsIGVycm9yLmdldCgpKTsKKyAgICAgICAgICAgIE5TRXJyb3IqIGNhbGxiYWNr RXJyb3IgPSBbTlNFcnJvciBlcnJvcldpdGhEb21haW46V0tFcnJvckRvbWFpbiBjb2RlOnN0YXRp Y19jYXN0PGludD4oZXJyb3IpIHVzZXJJbmZvOm5pbF07CisgICAgICAgICAgICBoYW5kbGVyKG5p bCwgY2FsbGJhY2tFcnJvcik7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgaGFuZGxlcihz dHJpbmcsIG5pbCk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggZjc1MDkxMTY0NDQ1OTljNDkxYTA3NTUwY2MyZWFmNDY0Y2U5OGY2 Mi4uZGY1ZmFkNTU2NGI0OTYxYWJiYjcwOTRiODY3YWRkMThiZDAwODAwOCAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDE4LTA4LTI4ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBlcnJvciBpbmZvcm1hdGlvbiB0byBoZWxwIGRlYnVnIHRlc3QgZmFpbHVyZSBpbiBXS05hdmln YXRpb24uUHJvY2Vzc0NyYXNoRHVyaW5nQ2FsbGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTAzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbToKKyAgICAgICAgKFRFU1QpOgorCiAy MDE4LTA4LTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAg ICAgIFtBdHRhY2htZW50IFN1cHBvcnRdIFJlbW92ZSBXZWJDb3JlOjpBdHRhY2htZW50RGlzcGxh eU9wdGlvbnMgYW5kIGZyaWVuZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWlu YXRlLm1tCmluZGV4IDQwNTBlYmQzOWJmOGU0MTg3MGRhMjQ1MTY0ODM5ZTM1OTAzNDhmYTQuLjVk ZjU4YmY1YzFhN2QyZDZjNDFhOGQwZjdmN2E2ZjlhMDEyY2JiZTMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJt aW5hdGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJD b250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbQpAQCAtMjI5LDM4ICsyMjksNDQgQEAgVEVTVChX S05hdmlnYXRpb24sIFByb2Nlc3NDcmFzaER1cmluZ0NhbGxiYWNrKQogCiAgICAgX19ibG9jayBX S1dlYlZpZXcgKnZpZXcgPSB3ZWJWaWV3LmdldCgpOwogICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50 c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vy cm9yICplcnJvcikgewotICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgaWYg KCEhZXJyb3IpCisgICAgICAgICAgICBFWFBFQ1RfRVEoZXJyb3IuY29kZSwgV0tFcnJvcldlYkNv bnRlbnRQcm9jZXNzVGVybWluYXRlZCk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsKICAgICAg ICAgaWYgKGNhbGxiYWNrQ291bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENhbGxiYWNr cyA9IHRydWU7CiAgICAgfV07CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRo Q29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9yKSB7 Ci0gICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJvcikKKyAg ICAgICAgICAgIEVYUEVDVF9FUShlcnJvci5jb2RlLCBXS0Vycm9yV2ViQ29udGVudFByb2Nlc3NU ZXJtaW5hdGVkKTsKICAgICAgICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAoY2FsbGJh Y2tDb3VudCA9PSA2KQogICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKICAg ICB9XTsKICAgICBbd2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFu ZGxlcjpeKE5TU3RyaW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAgICAgRVhQ RUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAgICAgRVhQ RUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JXZWJDb250ZW50UHJvY2Vzc1Rlcm1pbmF0ZWQpOwog ICAgICAgICBbdmlldyBfY2xvc2VdOyAvLyBDYWxsaW5nIF9jbG9zZSB3aWxsIGFsc28gaW52YWxp ZGF0ZSBhbGwgY2FsbGJhY2tzLgogICAgICAgICArK2NhbGxiYWNrQ291bnQ7CiAgICAgICAgIGlm IChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAgICBjYWxsZWRBbGxDYWxsYmFja3MgPSB0 cnVlOwogICAgIH1dOwogICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50c0FzU3RyaW5nV2l0aENvbXBs ZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vycm9yICplcnJvcikgewotICAg ICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgaWYgKCEhZXJyb3IpCisgICAgICAg ICAgICBFWFBFQ1RfRVEoZXJyb3IuY29kZSwgV0tFcnJvcldlYkNvbnRlbnRQcm9jZXNzVGVybWlu YXRlZCk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsKICAgICAgICAgaWYgKGNhbGxiYWNrQ291 bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENhbGxiYWNrcyA9IHRydWU7CiAgICAgfV07 CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6 XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9yKSB7Ci0gICAgICAgIEVYUEVDVF9U UlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJvcikKKyAgICAgICAgICAgIEVYUEVDVF9F UShlcnJvci5jb2RlLCBXS0Vycm9yV2ViQ29udGVudFByb2Nlc3NUZXJtaW5hdGVkKTsKICAgICAg ICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAoY2FsbGJhY2tDb3VudCA9PSA2KQogICAg ICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKICAgICB9XTsKICAgICBbd2ViVmll dyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeKE5TU3RyaW5nICpj b250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAgICAgRVhQRUNUX1RSVUUoISFlcnJvcik7 CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUs IFdLRXJyb3JXZWJDb250ZW50UHJvY2Vzc1Rlcm1pbmF0ZWQpOwogICAgICAgICArK2NhbGxiYWNr Q291bnQ7CiAgICAgICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAgICBjYWxs ZWRBbGxDYWxsYmFja3MgPSB0cnVlOwo= 348320 2018-08-28 12:13:54 -0700 2018-08-28 13:48:00 -0700 Patch bug-189037-20180828121354.patch text/plain 6578 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2OTRlZDFiZjY3OTdhZTBh ZmMzODE0YzgzYjIwYjJmN2JmOTNiNmMuLjU4MmE0YWNhNWRjNTcyZWJkMzU2OTcyNjQ3NjEwNDZl NDg4MDc5NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDgtMjggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGVycm9yIGluZm9ybWF0aW9u IHRvIGhlbHAgZGVidWcgdGVzdCBmYWlsdXJlIGluIFdLTmF2aWdhdGlvbi5Qcm9jZXNzQ3Jhc2hE dXJpbmdDYWxsYmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg5MDM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tX ZWJWaWV3IF9nZXRNYWluUmVzb3VyY2VEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOl0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2dldFdlYkFyY2hpdmVEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVy Ol0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxl dGlvbkhhbmRsZXI6XSk6CisKIDIwMTgtMDgtMjggIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlA YXBwbGUuY29tPgogCiAgICAgICAgIFtEYXRhbGlzdF0gUHJlc3NpbmcgZW50ZXIgd2l0aG91dCBh IHNlbGVjdGVkIG9wdGlvbiBzaG91bGRuJ3QgY2hhbmdlIHRoZSBpbnB1dApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggNjllZTNkMzk2Zjhj MjY0NWQ1NDg0MGE1MzVmZTllYmMyYzVhM2ZhNy4uNGU2OTQxMmYyNzMyN2I4OWRlNWVlMjAwODk4 N2U5OTVkYzNlYjg1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC00NTczLDggKzQ1NzMsOCBAQCAtICh2b2lkKV9nZXRNYWluUmVzb3Vy Y2VEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU0RhdGEgKiwgTlNFcnJvciAq KQogICAgICAgICB2b2lkICheY29tcGxldGlvbkhhbmRsZXJCbG9jaykoTlNEYXRhICosIE5TRXJy b3IgKikgPSAodm9pZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpaGFuZGxlci5nZXQoKTsKICAg ICAgICAgaWYgKGVycm9yICE9IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkgewog ICAgICAgICAgICAgLy8gRklYTUU6IFBpcGUgYSBwcm9wZXIgZXJyb3IgaW4gZnJvbSB0aGUgV2Vi UGFnZVByb3h5LgotICAgICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IGVycm9yID0gYWRvcHRO UyhbW05TRXJyb3IgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy QmxvY2sobmlsLCBlcnJvci5nZXQoKSk7CisgICAgICAgICAgICBOU0Vycm9yKiBjYWxsYmFja0Vy cm9yID0gW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29kZTpzdGF0aWNf Y2FzdDxpbnQ+KGVycm9yKSB1c2VySW5mbzpuaWxdOworICAgICAgICAgICAgY29tcGxldGlvbkhh bmRsZXJCbG9jayhuaWwsIGNhbGxiYWNrRXJyb3IpOwogICAgICAgICB9IGVsc2UKICAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyQmxvY2sod3JhcHBlcigqZGF0YSksIG5pbCk7CiAgICAgfSk7 CkBAIC00NTg4LDggKzQ1ODgsOCBAQCAtICh2b2lkKV9nZXRXZWJBcmNoaXZlRGF0YVdpdGhDb21w bGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpYwogICAgICAgICB2 b2lkICheY29tcGxldGlvbkhhbmRsZXJCbG9jaykoTlNEYXRhICosIE5TRXJyb3IgKikgPSAodm9p ZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpaGFuZGxlci5nZXQoKTsKICAgICAgICAgaWYgKGVy cm9yICE9IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkgewogICAgICAgICAgICAg Ly8gRklYTUU6IFBpcGUgYSBwcm9wZXIgZXJyb3IgaW4gZnJvbSB0aGUgV2ViUGFnZVByb3h5Lgot ICAgICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IGVycm9yID0gYWRvcHROUyhbW05TRXJyb3Ig YWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyQmxvY2sobmlsLCBl cnJvci5nZXQoKSk7CisgICAgICAgICAgICBOU0Vycm9yKiBjYWxsYmFja0Vycm9yID0gW05TRXJy b3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29kZTpzdGF0aWNfY2FzdDxpbnQ+KGVy cm9yKSB1c2VySW5mbzpuaWxdOworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXJCbG9jayhu aWwsIGNhbGxiYWNrRXJyb3IpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGNvbXBsZXRp b25IYW5kbGVyQmxvY2sod3JhcHBlcigqZGF0YSksIG5pbCk7CiAgICAgfSk7CkBAIC00NjAyLDgg KzQ2MDIsOCBAQCAtICh2b2lkKV9nZXRDb250ZW50c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5k bGVyOih2b2lkICheKShOU1N0cmluZyAqLCBOU0Vycm9yCiAgICAgX3BhZ2UtPmdldENvbnRlbnRz QXNTdHJpbmcoW2hhbmRsZXJdKFN0cmluZyBzdHJpbmcsIFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpF cnJvciBlcnJvcikgewogICAgICAgICBpZiAoZXJyb3IgIT0gV2ViS2l0OjpDYWxsYmFja0Jhc2U6 OkVycm9yOjpOb25lKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogUGlwZSBhIHByb3BlciBlcnJv ciBpbiBmcm9tIHRoZSBXZWJQYWdlUHJveHkuCi0gICAgICAgICAgICBSZXRhaW5QdHI8TlNFcnJv cj4gZXJyb3IgPSBhZG9wdE5TKFtbTlNFcnJvciBhbGxvY10gaW5pdF0pOwotICAgICAgICAgICAg aGFuZGxlcihuaWwsIGVycm9yLmdldCgpKTsKKyAgICAgICAgICAgIE5TRXJyb3IqIGNhbGxiYWNr RXJyb3IgPSBbTlNFcnJvciBlcnJvcldpdGhEb21haW46V0tFcnJvckRvbWFpbiBjb2RlOnN0YXRp Y19jYXN0PGludD4oZXJyb3IpIHVzZXJJbmZvOm5pbF07CisgICAgICAgICAgICBoYW5kbGVyKG5p bCwgY2FsbGJhY2tFcnJvcik7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgaGFuZGxlcihz dHJpbmcsIG5pbCk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggZjc1MDkxMTY0NDQ1OTljNDkxYTA3NTUwY2MyZWFmNDY0Y2U5OGY2 Mi4uZGY1ZmFkNTU2NGI0OTYxYWJiYjcwOTRiODY3YWRkMThiZDAwODAwOCAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDE4LTA4LTI4ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBlcnJvciBpbmZvcm1hdGlvbiB0byBoZWxwIGRlYnVnIHRlc3QgZmFpbHVyZSBpbiBXS05hdmln YXRpb24uUHJvY2Vzc0NyYXNoRHVyaW5nQ2FsbGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTAzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbToKKyAgICAgICAgKFRFU1QpOgorCiAy MDE4LTA4LTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAg ICAgIFtBdHRhY2htZW50IFN1cHBvcnRdIFJlbW92ZSBXZWJDb3JlOjpBdHRhY2htZW50RGlzcGxh eU9wdGlvbnMgYW5kIGZyaWVuZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWlu YXRlLm1tCmluZGV4IDQwNTBlYmQzOWJmOGU0MTg3MGRhMjQ1MTY0ODM5ZTM1OTAzNDhmYTQuLjZi ZGQ1MzI2NjQ4NTljODU0Y2Y0NGYyY2E1NGUyNTM1YzkzMTQxYjMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJt aW5hdGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJD b250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbQpAQCAtMjI5LDM4ICsyMjksNDQgQEAgVEVTVChX S05hdmlnYXRpb24sIFByb2Nlc3NDcmFzaER1cmluZ0NhbGxiYWNrKQogCiAgICAgX19ibG9jayBX S1dlYlZpZXcgKnZpZXcgPSB3ZWJWaWV3LmdldCgpOwogICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50 c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vy cm9yICplcnJvcikgewotICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgaWYg KCEhZXJyb3IpCisgICAgICAgICAgICBFWFBFQ1RfRVEoV0tFcnJvcldlYkNvbnRlbnRQcm9jZXNz VGVybWluYXRlZCwgZXJyb3IuY29kZSk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsKICAgICAg ICAgaWYgKGNhbGxiYWNrQ291bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENhbGxiYWNr cyA9IHRydWU7CiAgICAgfV07CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRo Q29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9yKSB7 Ci0gICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJvcikKKyAg ICAgICAgICAgIEVYUEVDVF9FUShXS0Vycm9yV2ViQ29udGVudFByb2Nlc3NUZXJtaW5hdGVkLCBl cnJvci5jb2RlKTsKICAgICAgICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAoY2FsbGJh Y2tDb3VudCA9PSA2KQogICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKICAg ICB9XTsKICAgICBbd2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFu ZGxlcjpeKE5TU3RyaW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAgICAgRVhQ RUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAgICAgRVhQ RUNUX0VRKFdLRXJyb3JXZWJDb250ZW50UHJvY2Vzc1Rlcm1pbmF0ZWQsIGVycm9yLmNvZGUpOwog ICAgICAgICBbdmlldyBfY2xvc2VdOyAvLyBDYWxsaW5nIF9jbG9zZSB3aWxsIGFsc28gaW52YWxp ZGF0ZSBhbGwgY2FsbGJhY2tzLgogICAgICAgICArK2NhbGxiYWNrQ291bnQ7CiAgICAgICAgIGlm IChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAgICBjYWxsZWRBbGxDYWxsYmFja3MgPSB0 cnVlOwogICAgIH1dOwogICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50c0FzU3RyaW5nV2l0aENvbXBs ZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vycm9yICplcnJvcikgewotICAg ICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgaWYgKCEhZXJyb3IpCisgICAgICAg ICAgICBFWFBFQ1RfRVEoV0tFcnJvcldlYkNvbnRlbnRQcm9jZXNzVGVybWluYXRlZCwgZXJyb3Iu Y29kZSk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsKICAgICAgICAgaWYgKGNhbGxiYWNrQ291 bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENhbGxiYWNrcyA9IHRydWU7CiAgICAgfV07 CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6 XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9yKSB7Ci0gICAgICAgIEVYUEVDVF9U UlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJvcikKKyAgICAgICAgICAgIEVYUEVDVF9F UShXS0Vycm9yV2ViQ29udGVudFByb2Nlc3NUZXJtaW5hdGVkLCBlcnJvci5jb2RlKTsKICAgICAg ICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAoY2FsbGJhY2tDb3VudCA9PSA2KQogICAg ICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKICAgICB9XTsKICAgICBbd2ViVmll dyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeKE5TU3RyaW5nICpj b250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAgICAgRVhQRUNUX1RSVUUoISFlcnJvcik7 CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAgICAgRVhQRUNUX0VRKFdLRXJyb3JXZWJD b250ZW50UHJvY2Vzc1Rlcm1pbmF0ZWQsIGVycm9yLmNvZGUpOwogICAgICAgICArK2NhbGxiYWNr Q291bnQ7CiAgICAgICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAgICBjYWxs ZWRBbGxDYWxsYmFja3MgPSB0cnVlOwo= 348338 2018-08-28 13:48:02 -0700 2018-08-28 14:26:29 -0700 Patch for landing bug-189037-20180828134801.patch text/plain 6413 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2OTRlZDFiZjY3OTdhZTBh ZmMzODE0YzgzYjIwYjJmN2JmOTNiNmMuLjc1YWJlMTQ1N2VmNGZlOGZjYjdmMzI0MDVkYWMwY2I4 NGM1MjVkY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDgtMjggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGVycm9yIGluZm9ybWF0aW9u IHRvIGhlbHAgZGVidWcgdGVzdCBmYWlsdXJlIGluIFdLTmF2aWdhdGlvbi5Qcm9jZXNzQ3Jhc2hE dXJpbmdDYWxsYmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg5MDM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJW aWV3IF9nZXRNYWluUmVzb3VyY2VEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX2dldFdlYkFyY2hpdmVEYXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOl0p OgorICAgICAgICAoLVtXS1dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxldGlv bkhhbmRsZXI6XSk6CisKIDIwMTgtMDgtMjggIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBw bGUuY29tPgogCiAgICAgICAgIFtEYXRhbGlzdF0gUHJlc3NpbmcgZW50ZXIgd2l0aG91dCBhIHNl bGVjdGVkIG9wdGlvbiBzaG91bGRuJ3QgY2hhbmdlIHRoZSBpbnB1dApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggNjllZTNkMzk2ZjhjMjY0 NWQ1NDg0MGE1MzVmZTllYmMyYzVhM2ZhNy4uZTVmNDBmN2UxMDcyNjEwMDUyODQ2MzVmYzYzZDIw Mjk2MzdhYmYzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tCkBAIC00NTczLDggKzQ1NzMsNyBAQCAtICh2b2lkKV9nZXRNYWluUmVzb3VyY2VE YXRhV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU0RhdGEgKiwgTlNFcnJvciAqKQog ICAgICAgICB2b2lkICheY29tcGxldGlvbkhhbmRsZXJCbG9jaykoTlNEYXRhICosIE5TRXJyb3Ig KikgPSAodm9pZCAoXikoTlNEYXRhICosIE5TRXJyb3IgKikpaGFuZGxlci5nZXQoKTsKICAgICAg ICAgaWYgKGVycm9yICE9IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkgewogICAg ICAgICAgICAgLy8gRklYTUU6IFBpcGUgYSBwcm9wZXIgZXJyb3IgaW4gZnJvbSB0aGUgV2ViUGFn ZVByb3h5LgotICAgICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IGVycm9yID0gYWRvcHROUyhb W05TRXJyb3IgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyQmxv Y2sobmlsLCBlcnJvci5nZXQoKSk7CisgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlckJsb2Nr KG5pbCwgW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29kZTpzdGF0aWNf Y2FzdDxpbnQ+KGVycm9yKSB1c2VySW5mbzpuaWxdKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAg ICAgICBjb21wbGV0aW9uSGFuZGxlckJsb2NrKHdyYXBwZXIoKmRhdGEpLCBuaWwpOwogICAgIH0p OwpAQCAtNDU4OCw4ICs0NTg3LDcgQEAgLSAodm9pZClfZ2V0V2ViQXJjaGl2ZURhdGFXaXRoQ29t cGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TRGF0YSAqLCBOU0Vycm9yICopKWMKICAgICAgICAg dm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyQmxvY2spKE5TRGF0YSAqLCBOU0Vycm9yICopID0gKHZv aWQgKF4pKE5TRGF0YSAqLCBOU0Vycm9yICopKWhhbmRsZXIuZ2V0KCk7CiAgICAgICAgIGlmIChl cnJvciAhPSBXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3I6Ok5vbmUpIHsKICAgICAgICAgICAg IC8vIEZJWE1FOiBQaXBlIGEgcHJvcGVyIGVycm9yIGluIGZyb20gdGhlIFdlYlBhZ2VQcm94eS4K LSAgICAgICAgICAgIFJldGFpblB0cjxOU0Vycm9yPiBlcnJvciA9IGFkb3B0TlMoW1tOU0Vycm9y IGFsbG9jXSBpbml0XSk7Ci0gICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlckJsb2NrKG5pbCwg ZXJyb3IuZ2V0KCkpOworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXJCbG9jayhuaWwsIFtO U0Vycm9yIGVycm9yV2l0aERvbWFpbjpXS0Vycm9yRG9tYWluIGNvZGU6c3RhdGljX2Nhc3Q8aW50 PihlcnJvcikgdXNlckluZm86bmlsXSk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgY29t cGxldGlvbkhhbmRsZXJCbG9jayh3cmFwcGVyKCpkYXRhKSwgbmlsKTsKICAgICB9KTsKQEAgLTQ2 MDIsOCArNDYwMCw3IEBAIC0gKHZvaWQpX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKE5TU3RyaW5nICosIE5TRXJyb3IKICAgICBfcGFnZS0+Z2V0Q29u dGVudHNBc1N0cmluZyhbaGFuZGxlcl0oU3RyaW5nIHN0cmluZywgV2ViS2l0OjpDYWxsYmFja0Jh c2U6OkVycm9yIGVycm9yKSB7CiAgICAgICAgIGlmIChlcnJvciAhPSBXZWJLaXQ6OkNhbGxiYWNr QmFzZTo6RXJyb3I6Ok5vbmUpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBQaXBlIGEgcHJvcGVy IGVycm9yIGluIGZyb20gdGhlIFdlYlBhZ2VQcm94eS4KLSAgICAgICAgICAgIFJldGFpblB0cjxO U0Vycm9yPiBlcnJvciA9IGFkb3B0TlMoW1tOU0Vycm9yIGFsbG9jXSBpbml0XSk7Ci0gICAgICAg ICAgICBoYW5kbGVyKG5pbCwgZXJyb3IuZ2V0KCkpOworICAgICAgICAgICAgaGFuZGxlcihuaWws IFtOU0Vycm9yIGVycm9yV2l0aERvbWFpbjpXS0Vycm9yRG9tYWluIGNvZGU6c3RhdGljX2Nhc3Q8 aW50PihlcnJvcikgdXNlckluZm86bmlsXSk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAg aGFuZGxlcihzdHJpbmcsIG5pbCk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjc1MDkxMTY0NDQ1OTljNDkxYTA3NTUwY2MyZWFm NDY0Y2U5OGY2Mi4uZjNmODMzYWVlZjA1Y2MyNTIwMGViNDM0NWEzMGUyMDhiNDRmZjg4OSAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDE4LTA4LTI4ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisg ICAgICAgIEFkZCBlcnJvciBpbmZvcm1hdGlvbiB0byBoZWxwIGRlYnVnIHRlc3QgZmFpbHVyZSBp biBXS05hdmlnYXRpb24uUHJvY2Vzc0NyYXNoRHVyaW5nQ2FsbGJhY2sKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTAzNworCisgICAgICAgIFJldmll d2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbToKKyAgICAgICAgKFRFU1Qp OgorCiAyMDE4LTA4LTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgog CiAgICAgICAgIFtBdHRhY2htZW50IFN1cHBvcnRdIFJlbW92ZSBXZWJDb3JlOjpBdHRhY2htZW50 RGlzcGxheU9wdGlvbnMgYW5kIGZyaWVuZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUubW0gYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNzRGlk VGVybWluYXRlLm1tCmluZGV4IDQwNTBlYmQzOWJmOGU0MTg3MGRhMjQ1MTY0ODM5ZTM1OTAzNDhm YTQuLjZiZGQ1MzI2NjQ4NTljODU0Y2Y0NGYyY2E1NGUyNTM1YzkzMTQxYjMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NE aWRUZXJtaW5hdGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbQpAQCAtMjI5LDM4ICsyMjksNDQgQEAg VEVTVChXS05hdmlnYXRpb24sIFByb2Nlc3NDcmFzaER1cmluZ0NhbGxiYWNrKQogCiAgICAgX19i bG9jayBXS1dlYlZpZXcgKnZpZXcgPSB3ZWJWaWV3LmdldCgpOwogICAgIFt3ZWJWaWV3IF9nZXRD b250ZW50c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRz LCBOU0Vycm9yICplcnJvcikgewotICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAg ICAgaWYgKCEhZXJyb3IpCisgICAgICAgICAgICBFWFBFQ1RfRVEoV0tFcnJvcldlYkNvbnRlbnRQ cm9jZXNzVGVybWluYXRlZCwgZXJyb3IuY29kZSk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsK ICAgICAgICAgaWYgKGNhbGxiYWNrQ291bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENh bGxiYWNrcyA9IHRydWU7CiAgICAgfV07CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJp bmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVy cm9yKSB7Ci0gICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJv cikKKyAgICAgICAgICAgIEVYUEVDVF9FUShXS0Vycm9yV2ViQ29udGVudFByb2Nlc3NUZXJtaW5h dGVkLCBlcnJvci5jb2RlKTsKICAgICAgICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAo Y2FsbGJhY2tDb3VudCA9PSA2KQogICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1 ZTsKICAgICB9XTsKICAgICBbd2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0 aW9uSGFuZGxlcjpeKE5TU3RyaW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAg ICAgRVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAg ICAgRVhQRUNUX0VRKFdLRXJyb3JXZWJDb250ZW50UHJvY2Vzc1Rlcm1pbmF0ZWQsIGVycm9yLmNv ZGUpOwogICAgICAgICBbdmlldyBfY2xvc2VdOyAvLyBDYWxsaW5nIF9jbG9zZSB3aWxsIGFsc28g aW52YWxpZGF0ZSBhbGwgY2FsbGJhY2tzLgogICAgICAgICArK2NhbGxiYWNrQ291bnQ7CiAgICAg ICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAgICBjYWxsZWRBbGxDYWxsYmFj a3MgPSB0cnVlOwogICAgIH1dOwogICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50c0FzU3RyaW5nV2l0 aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vycm9yICplcnJvcikg ewotICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgaWYgKCEhZXJyb3IpCisg ICAgICAgICAgICBFWFBFQ1RfRVEoV0tFcnJvcldlYkNvbnRlbnRQcm9jZXNzVGVybWluYXRlZCwg ZXJyb3IuY29kZSk7CiAgICAgICAgICsrY2FsbGJhY2tDb3VudDsKICAgICAgICAgaWYgKGNhbGxi YWNrQ291bnQgPT0gNikKICAgICAgICAgICAgIGNhbGxlZEFsbENhbGxiYWNrcyA9IHRydWU7CiAg ICAgfV07CiAgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxldGlvbkhh bmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9yKSB7Ci0gICAgICAgIEVY UEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBpZiAoISFlcnJvcikKKyAgICAgICAgICAgIEVY UEVDVF9FUShXS0Vycm9yV2ViQ29udGVudFByb2Nlc3NUZXJtaW5hdGVkLCBlcnJvci5jb2RlKTsK ICAgICAgICAgKytjYWxsYmFja0NvdW50OwogICAgICAgICBpZiAoY2FsbGJhY2tDb3VudCA9PSA2 KQogICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKICAgICB9XTsKICAgICBb d2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeKE5TU3Ry aW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKLSAgICAgICAgRVhQRUNUX1RSVUUoISFl cnJvcik7CisgICAgICAgIGlmICghIWVycm9yKQorICAgICAgICAgICAgRVhQRUNUX0VRKFdLRXJy b3JXZWJDb250ZW50UHJvY2Vzc1Rlcm1pbmF0ZWQsIGVycm9yLmNvZGUpOwogICAgICAgICArK2Nh bGxiYWNrQ291bnQ7CiAgICAgICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCiAgICAgICAgICAg ICBjYWxsZWRBbGxDYWxsYmFja3MgPSB0cnVlOwo=