209368 2020-03-20 16:54:18 -0700 Add checks for app-bound navigations when evaluating user style sheets 2020-03-23 12:15:37 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney aestes bfulgham cdumez ews-watchlist japhet koivisto thorton wilander oldest_to_newest 1632375 0 katherine_cheney 2020-03-20 16:54:18 -0700 We should check for app-bound navigations when we update user style sheets for pages. 1632376 1 katherine_cheney 2020-03-20 16:55:27 -0700 <rdar://problem/60204230> 1632381 2 394150 katherine_cheney 2020-03-20 17:08:08 -0700 Created attachment 394150 Patch 1632857 3 394263 katherine_cheney 2020-03-23 08:41:48 -0700 Created attachment 394263 Patch 1632870 4 394266 katherine_cheney 2020-03-23 09:32:28 -0700 Created attachment 394266 Patch 1632923 5 394266 bfulgham 2020-03-23 10:40:27 -0700 Comment on attachment 394266 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394266&action=review Awesome! Thank you for creating useful tests for this. r=me, but please add the logging I suggest. > Source/WebCore/page/Page.cpp:3078 > + if (m_mainFrame->loader().client().hasNavigatedAwayFromAppBoundDomain()) I feel like we should issue some kind of console message so developers will know what's going on. Look for instances of 'document->addConsoleMessage' (or context->addConsoleMessage) for examples. > Source/WebCore/style/StyleScopeRuleSets.cpp:98 > + collectRulesFromUserStyleSheets(extensionStyleSheets.injectedUserStyleSheets(), tempUserStyle.get(), mediaQueryEvaluator); I suggest: auto* page = m_styleResolver.document().page(); if (page && page->mainFrame().loader().client().hasNavigatedAwayFromAppBoundDomain()) m_styleResolver.document().addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user style sheet for non-app bound domain."_s); else collectRulesFromUserStyleSheets(extensionStyleSheets.injectedUserStyleSheets(), tempUserStyle.get(), mediaQueryEvaluator); > Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:76 > + response = @"<body style='background-color: red;'><iframe src='in-app-browser:///in-app-browser-privacy-test-user-style-sheets'></iframe></body>"; Nice! 1632937 6 394279 katherine_cheney 2020-03-23 11:11:44 -0700 Created attachment 394279 Patch for landing 1632938 7 katherine_cheney 2020-03-23 11:12:40 -0700 (In reply to Brent Fulgham from comment #5) > Comment on attachment 394266 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394266&action=review > > Awesome! Thank you for creating useful tests for this. r=me, but please add > the logging I suggest. Thanks! I added the logging you suggested. 1632960 8 ews-feeder 2020-03-23 11:47:53 -0700 Committed r258863: <https://trac.webkit.org/changeset/258863> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394279. 394150 2020-03-20 17:08:08 -0700 2020-03-23 08:41:46 -0700 Patch bug-209368-20200320170807.patch text/plain 10893 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGYxOTBjZjQwZjIzMTE4 MTkyZjM0MWI2YzZhZTRkZDQ4M2Y1N2I4YS4uZTkwYmE0ODkyYzZkNGU2NjU1OGI5NTZkNGUzNjk5 ZGFkYmFlMDYzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTIwICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBjaGVj a3MgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9ucyB3aGVuIGV2YWx1YXRpbmcgdXNlciBzdHlsZSBz aGVldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw OTM2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAyMDQyMzA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6aW5qZWN0VXNlclN0eWxlU2hlZXQpOgorICAgICAgICBJZiB0aGUg c3R5bGUgc2hlZXQgaXMgZm9yIGEgc3BlY2lmaWMgV2ViVmlldywgaXQgd2lsbCBoYXZlIGEgcGFn ZUlECisgICAgICAgIGFuZCB3ZSBjYW4gY2hlY2sgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9uIGlu IHRoZSBwYWdlIG9iamVjdC4KKworICAgICAgICAqIHN0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVSdWxlU2V0czo6aW5pdGlhbGl6ZVVz ZXJTdHlsZSk6CisgICAgICAgIElmIHRoZSB1c2VyIHN0eWxlIHNoZWV0IGlzIGJlaW5nIGFwcGxp ZWQgdG8gYWxsIFdlYlZpZXdzLCB3ZSBjYW4gY2hlY2sgZm9yIGEKKyAgICAgICAgc3BlY2lmaWMg cGFnZSdzIG5hdmlnYXRpb24gc3RhdGUgaGVyZSBiZWZvcmUgdGhlIHN0eWxlIHNoZWV0IGlzCisg ICAgICAgIHVwZGF0ZWQuCisKIDIwMjAtMDMtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEF2b2lkIGluZmluaXRlIGxvb3Agd2hlbiBzdHVj ayBvbiBwYXJ0aWFsIGNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IGI3NmNiYTIwYjkxNmRl YTg2Zjg4MjkxNzU3ZTUwZDFmOGNlODM4MjMuLjdmMmEyNzE5NDIyZTg2YWU4OTE1NDU4ZDE4YmE0 MTlhODQ0NmE0ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMzA3NSw2ICszMDc1LDkgQEAgdm9p ZCBQYWdlOjpyZXZlYWxDdXJyZW50U2VsZWN0aW9uKCkKIAogdm9pZCBQYWdlOjppbmplY3RVc2Vy U3R5bGVTaGVldChVc2VyU3R5bGVTaGVldCYgdXNlclN0eWxlU2hlZXQpCiB7CisgICAgaWYgKG1f bWFpbkZyYW1lLT5sb2FkZXIoKS5jbGllbnQoKS5oYXNOYXZpZ2F0ZWRBd2F5RnJvbUFwcEJvdW5k RG9tYWluKCkpCisgICAgICAgIHJldHVybjsKKyAgICAKICAgICAvLyBXZSBuZWVkIHRvIHdhaXQg dW50aWwgd2UncmUgbm8gbG9uZ2VyIGRpc3BsYXlpbmcgdGhlIGluaXRpYWwgZW1wdHkgZG9jdW1l bnQgYmVmb3JlIHdlIGNhbiBpbmplY3QgdGhlIHN0eWxlc2hlZXRzLgogICAgIGlmIChtX21haW5G cmFtZS0+bG9hZGVyKCkuc3RhdGVNYWNoaW5lKCkuaXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9j dW1lbnQoKSkgewogICAgICAgICBtX3VzZXJTdHlsZVNoZWV0c1BlbmRpbmdJbmplY3Rpb24uYXBw ZW5kKHVzZXJTdHlsZVNoZWV0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlU2NvcGVSdWxlU2V0cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVs ZVNldHMuY3BwCmluZGV4IGRiM2IyYmFhYTE1NTM0NGFhNWIyMjliNWUzYzRkN2IzZjEwNTkxOGMu LmFhYTIxM2U5ZGVlZjBlNmYyZDhiMzQ3MmIwOGM4NjczZDBjNjQ3N2MgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcApAQCAtMzEsNyArMzEsMTEgQEAKIAog I2luY2x1ZGUgIkNTU1N0eWxlU2hlZXQuaCIKICNpbmNsdWRlICJFeHRlbnNpb25TdHlsZVNoZWV0 cy5oIgorI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKKyNpbmNs dWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIk1lZGlhUXVlcnlFdmFsdWF0b3Iu aCIKKyNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiU3R5bGVSZXNvbHZlci5oIgogI2luY2x1 ZGUgIlN0eWxlU2hlZXRDb250ZW50cy5oIgogCkBAIC04Nyw3ICs5MSw4IEBAIHZvaWQgU2NvcGVS dWxlU2V0czo6aW5pdGlhbGl6ZVVzZXJTdHlsZSgpCiAgICAgYXV0byB0ZW1wVXNlclN0eWxlID0g UnVsZVNldDo6Y3JlYXRlKCk7CiAgICAgaWYgKENTU1N0eWxlU2hlZXQqIHBhZ2VVc2VyU2hlZXQg PSBleHRlbnNpb25TdHlsZVNoZWV0cy5wYWdlVXNlclNoZWV0KCkpCiAgICAgICAgIHRlbXBVc2Vy U3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHBhZ2VVc2VyU2hlZXQtPmNvbnRlbnRzKCksIG51bGxw dHIsIG1lZGlhUXVlcnlFdmFsdWF0b3IsIG1fc3R5bGVSZXNvbHZlcik7Ci0gICAgY29sbGVjdFJ1 bGVzRnJvbVVzZXJTdHlsZVNoZWV0cyhleHRlbnNpb25TdHlsZVNoZWV0cy5pbmplY3RlZFVzZXJT dHlsZVNoZWV0cygpLCB0ZW1wVXNlclN0eWxlLmdldCgpLCBtZWRpYVF1ZXJ5RXZhbHVhdG9yKTsK KyAgICBpZiAoIW1fc3R5bGVSZXNvbHZlci5kb2N1bWVudCgpLnBhZ2UoKS0+bWFpbkZyYW1lKCku bG9hZGVyKCkuY2xpZW50KCkuaGFzTmF2aWdhdGVkQXdheUZyb21BcHBCb3VuZERvbWFpbigpKQor ICAgICAgICBjb2xsZWN0UnVsZXNGcm9tVXNlclN0eWxlU2hlZXRzKGV4dGVuc2lvblN0eWxlU2hl ZXRzLmluamVjdGVkVXNlclN0eWxlU2hlZXRzKCksIHRlbXBVc2VyU3R5bGUuZ2V0KCksIG1lZGlh UXVlcnlFdmFsdWF0b3IpOwogICAgIGNvbGxlY3RSdWxlc0Zyb21Vc2VyU3R5bGVTaGVldHMoZXh0 ZW5zaW9uU3R5bGVTaGVldHMuZG9jdW1lbnRVc2VyU3R5bGVTaGVldHMoKSwgdGVtcFVzZXJTdHls ZS5nZXQoKSwgbWVkaWFRdWVyeUV2YWx1YXRvcik7CiAgICAgaWYgKHRlbXBVc2VyU3R5bGUtPnJ1 bGVDb3VudCgpID4gMCB8fCB0ZW1wVXNlclN0eWxlLT5wYWdlUnVsZXMoKS5zaXplKCkgPiAwKQog ICAgICAgICBtX3VzZXJTdHlsZSA9IFdURk1vdmUodGVtcFVzZXJTdHlsZSk7CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM3NjhkYWIwODZmMGE0 ODRmZWUwNmExYmM0ZDM4Yzg1MWE5ZmFkZi4uZDJlZmQ5ODQ3Mjg0M2E2MTFlM2YwNWNjMjQzMTZh MmE0NDZhNGViMCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTIwICBLYXRlIENoZW5leSAgPGthdGhlcmlu ZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBjaGVja3MgZm9yIGFwcC1ib3VuZCBu YXZpZ2F0aW9ucyB3aGVuIGV2YWx1YXRpbmcgdXNlciBzdHlsZSBzaGVldHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTM2OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNjAyMDQyMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGVzdGVkIGNhc2VzIGJhc2VkIG9uIHRob3NlIGluIFVzZXJDb250ZW50 Q29udHJvbGxlci5tbS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbToKKyAgICAgICAgKC1bSW5BcHBCcm93c2VyU2NoZW1l SGFuZGxlciB3ZWJWaWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpdKToKKyAgICAgICAgKGV4cGVjdFNj cmlwdEV2YWx1YXRlc1RvQ29sb3IpOgorICAgICAgICAoVEVTVCk6CisKKwogMjAyMC0wMy0yMCAg QWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3c10gY29t bWl0LXF1ZXVlIHNob3VsZCBjb21tZW50IG9uIGJ1ZyBpZiBwYXRjaCBmYWlscyB0byBhcHBseQpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbkFwcEJy b3dzZXJQcml2YWN5Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9J bkFwcEJyb3dzZXJQcml2YWN5Lm1tCmluZGV4IDAzZDMzM2UzMzFmMjY2ZmQ5YWViMjhlOTYwZTc1 ZWI3NWFhOTgzZWEuLjNiNGY1OTBjMzkxMGYxZGEwNjBmYmFkOWVkM2UyZWY3YmZmYzMzNmYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5BcHBCcm93 c2VyUHJpdmFjeS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L0luQXBwQnJvd3NlclByaXZhY3kubW0KQEAgLTM0LDYgKzM0LDggQEAKICNpbXBvcnQgPFdlYktp dC9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLVXNlckNvbnRlbnRD b250cm9sbGVyUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2Vic2l0ZURhdGFTdG9yZVBy aXZhdGUuaD4KKyNpbXBvcnQgPFdlYktpdC9fV0tVc2VyQ29udGVudFdvcmxkLmg+CisjaW1wb3J0 IDxXZWJLaXQvX1dLVXNlclN0eWxlU2hlZXQuaD4KICNpbXBvcnQgPHd0Zi9SdW5Mb29wLmg+CiAj aW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNjgsNiArNzAsMTAgQEAgLSAodm9p ZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHN0YXJ0VVJMU2NoZW1lVGFzazooaWQgPFdL VVJMU2NoZW1lVGFzaz4pdGEKICAgICAgICAgcmVzcG9uc2UgPSBAIjxzY3JpcHQ+d2luZG93Lndl YmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEluQXBwQnJvd3NlclByaXZhY3kucG9zdE1lc3NhZ2Uo XCJkb25lXCIpOzwvc2NyaXB0PiI7CiAgICAgZWxzZSBpZiAoW3Rhc2sucmVxdWVzdC5VUkwucGF0 aCBpc0VxdWFsVG9TdHJpbmc6QCIvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0LXVzZXItYWdl bnQtc2NyaXB0Il0pCiAgICAgICAgIHJlc3BvbnNlID0gQCI8c2NyaXB0PiB3aW5kb3cud2tVc2Vy U2NyaXB0SW5qZWN0ZWQgPSB0cnVlOyA8L3NjcmlwdD4iOworICAgIGVsc2UgaWYgKFt0YXNrLnJl cXVlc3QuVVJMLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL2luLWFwcC1icm93c2VyLXByaXZhY3kt dGVzdC11c2VyLXN0eWxlLXNoZWV0cyJdKQorICAgICAgICByZXNwb25zZSA9IEAiPGJvZHkgc3R5 bGU9J2JhY2tncm91bmQtY29sb3I6IHJlZDsnPjwvYm9keT4iOworICAgIGVsc2UgaWYgKFt0YXNr LnJlcXVlc3QuVVJMLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL2luLWFwcC1icm93c2VyLXByaXZh Y3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0cy1pZnJhbWUiXSkKKyAgICAgICAgcmVzcG9uc2UgPSBA Ijxib2R5IHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7Jz48aWZyYW1lIHNyYz0naW4tYXBw LWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5bGUtc2hlZXRz Jz48L2lmcmFtZT48L2JvZHk+IjsKIAogICAgIFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTpbW1tO U1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0aFVSTDp0YXNrLnJlcXVlc3QuVVJMIE1JTUVUeXBl OkAidGV4dC9odG1sIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6cmVzcG9uc2UubGVuZ3RoIHRleHRF bmNvZGluZ05hbWU6bmlsXSBhdXRvcmVsZWFzZV1dOwogICAgIFt0YXNrIGRpZFJlY2VpdmVEYXRh OltyZXNwb25zZSBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ11dOwpAQCAt NDExLDUgKzQxNyw5MiBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIElnbm9yZUFwcEJvdW5k RG9tYWluc0FjY2VwdHNVc2VyU2NyaXB0cykKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmlzRG9uZSk7CiB9CiAKK3N0YXRpYyBOU1N0cmluZyAqc3R5bGVTaGVldFNvdXJjZSA9IEAiYm9k eSB7IGJhY2tncm91bmQtY29sb3I6IGdyZWVuICFpbXBvcnRhbnQ7IH0iOworc3RhdGljIE5TU3Ry aW5nICpiYWNrZ3JvdW5kQ29sb3JTY3JpcHQgPSBAIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRv Y3VtZW50LmJvZHksIG51bGwpLmdldFByb3BlcnR5VmFsdWUoJ2JhY2tncm91bmQtY29sb3InKSI7 CitzdGF0aWMgTlNTdHJpbmcgKmZyYW1lQmFja2dyb3VuZENvbG9yU2NyaXB0ID0gQCJ3aW5kb3cu Z2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnaWZyYW1lJylb MF0uY29udGVudERvY3VtZW50LmJvZHksIG51bGwpLmdldFByb3BlcnR5VmFsdWUoJ2JhY2tncm91 bmQtY29sb3InKSI7CitzdGF0aWMgY29uc3QgY2hhciogcmVkSW5SR0IgPSAicmdiKDI1NSwgMCwg MCkiOworCitzdGF0aWMgdm9pZCBleHBlY3RTY3JpcHRFdmFsdWF0ZXNUb0NvbG9yKFdLV2ViVmll dyAqd2ViVmlldywgTlNTdHJpbmcgKnNjcmlwdCwgY29uc3QgY2hhciogY29sb3IpCit7CisgICAg c3RhdGljIGJvb2wgZGlkQ2hlY2tCYWNrZ3JvdW5kQ29sb3I7CisKKyAgICBbd2ViVmlldyBldmFs dWF0ZUphdmFTY3JpcHQ6c2NyaXB0IGNvbXBsZXRpb25IYW5kbGVyOl4oaWQgdmFsdWUsIE5TRXJy b3IgKiBlcnJvcikgeworICAgICAgICBFWFBFQ1RfVFJVRShbdmFsdWUgaXNLaW5kT2ZDbGFzczpb TlNTdHJpbmcgY2xhc3NdXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShjb2xvciwgdmFsdWUp OworICAgICAgICBkaWRDaGVja0JhY2tncm91bmRDb2xvciA9IHRydWU7CisgICAgfV07CisKKyAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZENoZWNrQmFja2dyb3VuZENvbG9yKTsKKyAg ICBkaWRDaGVja0JhY2tncm91bmRDb2xvciA9IGZhbHNlOworfQorCitURVNUKEluQXBwQnJvd3Nl clByaXZhY3ksIE5vbkFwcEJvdW5kVXNlclN0eWxlU2hlZXRGb3JTcGVjaWZpY1dlYlZpZXdGYWls cykKK3sKKyAgICBpbml0aWFsaXplSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOwor CisgICAgUmV0YWluUHRyPFdLV2ViVmlld0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworCisgICAgYXV0 byBzY2hlbWVIYW5kbGVyID0gYWRvcHROUyhbW0luQXBwQnJvd3NlclNjaGVtZUhhbmRsZXIgYWxs b2NdIGluaXRdKTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOnNjaGVt ZUhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAiaW4tYXBwLWJyb3dzZXIiXTsKKyAgICBbW2Nv bmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdIF9zZXRJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZDpZ RVNdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2Nd IGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0 KCldKTsKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RX aXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJy b3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzIl1dOworICAgIFt3ZWJWaWV3IGxv YWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIFt3ZWJWaWV3IF90ZXN0X3dhaXRGb3JEaWRGaW5pc2hO YXZpZ2F0aW9uXTsKKworICAgIFJldGFpblB0cjxfV0tVc2VyQ29udGVudFdvcmxkPiB3b3JsZCA9 IFtfV0tVc2VyQ29udGVudFdvcmxkIHdvcmxkV2l0aE5hbWU6QCJUZXN0V29ybGQiXTsKKyAgICBS ZXRhaW5QdHI8X1dLVXNlclN0eWxlU2hlZXQ+IHN0eWxlU2hlZXQgPSBhZG9wdE5TKFtbX1dLVXNl clN0eWxlU2hlZXQgYWxsb2NdIGluaXRXaXRoU291cmNlOnN0eWxlU2hlZXRTb3VyY2UgZm9yV0tX ZWJWaWV3OndlYlZpZXcuZ2V0KCkgZm9yTWFpbkZyYW1lT25seTpZRVMgdXNlckNvbnRlbnRXb3Js ZDp3b3JsZC5nZXQoKV0pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xs ZXJdIF9hZGRVc2VyU3R5bGVTaGVldDpzdHlsZVNoZWV0LmdldCgpXTsKKworICAgIGV4cGVjdFNj cmlwdEV2YWx1YXRlc1RvQ29sb3Iod2ViVmlldy5nZXQoKSwgYmFja2dyb3VuZENvbG9yU2NyaXB0 LCByZWRJblJHQik7Cit9CisKK1RFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgTm9uQXBwQm91bmRV c2VyU3R5bGVTaGVldEZvckFsbFdlYlZpZXdzRmFpbHMpCit7CisgICAgaW5pdGlhbGl6ZUluQXBw QnJvd3NlclByaXZhY3lUZXN0U2V0dGluZ3MoKTsKKworICAgIFJldGFpblB0cjxXS1dlYlZpZXdD b25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gYWxsb2NdIGluaXRdKTsKKworICAgIGF1dG8gc2NoZW1lSGFuZGxlciA9IGFkb3B0TlMo W1tJbkFwcEJyb3dzZXJTY2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgW2NvbmZpZ3Vy YXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdldCgpIGZvclVSTFNjaGVt ZTpAImluLWFwcC1icm93c2VyIl07CisgICAgW1tjb25maWd1cmF0aW9uIHByZWZlcmVuY2VzXSBf c2V0SW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQ6WUVTXTsKKworICAgIGF1dG8gd2ViVmlldyA9 IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdFplcm8g Y29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgTlNVUkxSZXF1ZXN0ICpy ZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmlu ZzpAImluLWFwcC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0 eWxlLXNoZWV0cyJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKyAgICBb d2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CisKKyAgICBSZXRhaW5Q dHI8X1dLVXNlclN0eWxlU2hlZXQ+IHN0eWxlU2hlZXQgPSBhZG9wdE5TKFtbX1dLVXNlclN0eWxl U2hlZXQgYWxsb2NdIGluaXRXaXRoU291cmNlOnN0eWxlU2hlZXRTb3VyY2UgZm9yTWFpbkZyYW1l T25seTpZRVNdKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBf YWRkVXNlclN0eWxlU2hlZXQ6c3R5bGVTaGVldC5nZXQoKV07CisKKyAgICBleHBlY3RTY3JpcHRF dmFsdWF0ZXNUb0NvbG9yKHdlYlZpZXcuZ2V0KCksIGJhY2tncm91bmRDb2xvclNjcmlwdCwgcmVk SW5SR0IpOworfQorCitURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIE5vbkFwcEJvdW5kVXNlclN0 eWxlU2hlZXRBZmZlY3RpbmdBbGxGcmFtZXNGYWlscykKK3sKKyAgICBpbml0aWFsaXplSW5BcHBC cm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOworCisgICAgUmV0YWluUHRyPFdLV2ViVmlld0Nv bmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBhbGxvY10gaW5pdF0pOworCisgICAgYXV0byBzY2hlbWVIYW5kbGVyID0gYWRvcHROUyhb W0luQXBwQnJvd3NlclNjaGVtZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbY29uZmlndXJh dGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOnNjaGVtZUhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1l OkAiaW4tYXBwLWJyb3dzZXIiXTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdIF9z ZXRJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZDpZRVNdOworCisgICAgYXV0byB3ZWJWaWV3ID0g YWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVybyBj b25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBOU1VSTFJlcXVlc3QgKnJl cXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5 bGUtc2hlZXRzLWlmcmFtZSJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsK KyAgICBbd2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CisKKyAgICBS ZXRhaW5QdHI8X1dLVXNlclN0eWxlU2hlZXQ+IHN0eWxlU2hlZXQgPSBhZG9wdE5TKFtbX1dLVXNl clN0eWxlU2hlZXQgYWxsb2NdIGluaXRXaXRoU291cmNlOnN0eWxlU2hlZXRTb3VyY2UgZm9yTWFp bkZyYW1lT25seTpOT10pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xs ZXJdIF9hZGRVc2VyU3R5bGVTaGVldDpzdHlsZVNoZWV0LmdldCgpXTsKKworICAgIC8vIFRoZSBt YWluIGZyYW1lIHNob3VsZCBiZSBhZmZlY3RlZC4KKyAgICBleHBlY3RTY3JpcHRFdmFsdWF0ZXNU b0NvbG9yKHdlYlZpZXcuZ2V0KCksIGJhY2tncm91bmRDb2xvclNjcmlwdCwgcmVkSW5SR0IpOwor CisgICAgLy8gVGhlIHN1YmZyYW1lIHNob3VsZCBhbHNvIGJlIGFmZmVjdGVkLgorICAgIGV4cGVj dFNjcmlwdEV2YWx1YXRlc1RvQ29sb3Iod2ViVmlldy5nZXQoKSwgZnJhbWVCYWNrZ3JvdW5kQ29s b3JTY3JpcHQsIHJlZEluUkdCKTsKK30KKwogI2VuZGlmIC8vIFVTRShBUFBMRV9JTlRFUk5BTF9T REspCiAK 394263 2020-03-23 08:41:48 -0700 2020-03-23 09:32:26 -0700 Patch bug-209368-20200323084147.patch text/plain 11135 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFkNGFkNTE3NzE0M2Nk NjUzODU1ZjYzYTdhZWI3YTJlMmNlNDJmMy4uYzZmZmQ4NDJhYTkyZDhhNDMzZDVkMGMyYTIxNGFj YjMzM2QzYmMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTIzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBjaGVj a3MgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9ucyB3aGVuIGV2YWx1YXRpbmcgdXNlciBzdHlsZSBz aGVldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw OTM2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAyMDQyMzA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6aW5qZWN0VXNlclN0eWxlU2hlZXQpOgorICAgICAgICBJZiB0aGUg c3R5bGUgc2hlZXQgaXMgZm9yIGEgc3BlY2lmaWMgV2ViVmlldywgaXQgd2lsbCBoYXZlIGEgcGFn ZUlECisgICAgICAgIGFuZCB3ZSBjYW4gY2hlY2sgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9uIGlu IHRoZSBwYWdlIG9iamVjdC4KKworICAgICAgICAqIHN0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVSdWxlU2V0czo6aW5pdGlhbGl6ZVVz ZXJTdHlsZSk6CisgICAgICAgIElmIHRoZSB1c2VyIHN0eWxlIHNoZWV0IGlzIGJlaW5nIGFwcGxp ZWQgdG8gYWxsIFdlYlZpZXdzLCB3ZSBjYW4gY2hlY2sgZm9yIAorICAgICAgICBmb3IgYSBwYWdl J3MgZXhpc3RlbmNlIGFuZCBuYXZpZ2F0aW9uIHN0YXRlIGhlcmUgYmVmb3JlIHRoZSBzdHlsZSBz aGVldCBpcworICAgICAgICB1cGRhdGVkLgorCiAyMDIwLTAzLTIzICBBbnRvaW5lIFF1aW50ICA8 Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25zXSBSZWZhY3RvciBj YW5jZWxEZWNsYXJhdGl2ZUFuaW1hdGlvbnNGb3JFbGVtZW50IGFuZCB3aWxsRGVzdHJveVJlbmRl cmVyRm9yRWxlbWVudCBvbiBBbmltYXRpb25UaW1lbGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXgg Yjc2Y2JhMjBiOTE2ZGVhODZmODgyOTE3NTdlNTBkMWY4Y2U4MzgyMy4uNzczNmVlYjdhMTVjNGI5 M2FmY2MzN2E3MzFmYjkwNDRmYWU0YWNhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0zMDc1LDYg KzMwNzUsOSBAQCB2b2lkIFBhZ2U6OnJldmVhbEN1cnJlbnRTZWxlY3Rpb24oKQogCiB2b2lkIFBh Z2U6OmluamVjdFVzZXJTdHlsZVNoZWV0KFVzZXJTdHlsZVNoZWV0JiB1c2VyU3R5bGVTaGVldCkK IHsKKyAgICBpZiAobV9tYWluRnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLmhhc05hdmlnYXRlZEF3 YXlGcm9tQXBwQm91bmREb21haW4oKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gV2UgbmVl ZCB0byB3YWl0IHVudGlsIHdlJ3JlIG5vIGxvbmdlciBkaXNwbGF5aW5nIHRoZSBpbml0aWFsIGVt cHR5IGRvY3VtZW50IGJlZm9yZSB3ZSBjYW4gaW5qZWN0IHRoZSBzdHlsZXNoZWV0cy4KICAgICBp ZiAobV9tYWluRnJhbWUtPmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLmlzRGlzcGxheWluZ0luaXRp YWxFbXB0eURvY3VtZW50KCkpIHsKICAgICAgICAgbV91c2VyU3R5bGVTaGVldHNQZW5kaW5nSW5q ZWN0aW9uLmFwcGVuZCh1c2VyU3R5bGVTaGVldCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVTY29wZVJ1bGVTZXRzLmNwcAppbmRleCBkYjNiMmJhYWExNTUzNDRhYTViMjI5YjVlM2M0ZDdi M2YxMDU5MThjLi5hZDZjNWIwMmQ3YTBkNmM4OWVhMTkxNjdiZGMyMzk5M2YxNzU2YWE1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKQEAgLTMxLDcgKzMx LDExIEBACiAKICNpbmNsdWRlICJDU1NTdHlsZVNoZWV0LmgiCiAjaW5jbHVkZSAiRXh0ZW5zaW9u U3R5bGVTaGVldHMuaCIKKyNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIkZyYW1lTG9hZGVy LmgiCisjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJNZWRpYVF1ZXJ5 RXZhbHVhdG9yLmgiCisjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIu aCIKICNpbmNsdWRlICJTdHlsZVNoZWV0Q29udGVudHMuaCIKIApAQCAtODcsNyArOTEsMTEgQEAg dm9pZCBTY29wZVJ1bGVTZXRzOjppbml0aWFsaXplVXNlclN0eWxlKCkKICAgICBhdXRvIHRlbXBV c2VyU3R5bGUgPSBSdWxlU2V0OjpjcmVhdGUoKTsKICAgICBpZiAoQ1NTU3R5bGVTaGVldCogcGFn ZVVzZXJTaGVldCA9IGV4dGVuc2lvblN0eWxlU2hlZXRzLnBhZ2VVc2VyU2hlZXQoKSkKICAgICAg ICAgdGVtcFVzZXJTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQocGFnZVVzZXJTaGVldC0+Y29udGVu dHMoKSwgbnVsbHB0ciwgbWVkaWFRdWVyeUV2YWx1YXRvciwgbV9zdHlsZVJlc29sdmVyKTsKLSAg ICBjb2xsZWN0UnVsZXNGcm9tVXNlclN0eWxlU2hlZXRzKGV4dGVuc2lvblN0eWxlU2hlZXRzLmlu amVjdGVkVXNlclN0eWxlU2hlZXRzKCksIHRlbXBVc2VyU3R5bGUuZ2V0KCksIG1lZGlhUXVlcnlF dmFsdWF0b3IpOworICAgIGlmIChhdXRvKiBwYWdlID0gbV9zdHlsZVJlc29sdmVyLmRvY3VtZW50 KCkucGFnZSgpKSB7CisgICAgICAgIGlmIChwYWdlLT5tYWluRnJhbWUoKS5sb2FkZXIoKS5jbGll bnQoKS5oYXNOYXZpZ2F0ZWRBd2F5RnJvbUFwcEJvdW5kRG9tYWluKCkpCisgICAgICAgICAgICBj b2xsZWN0UnVsZXNGcm9tVXNlclN0eWxlU2hlZXRzKGV4dGVuc2lvblN0eWxlU2hlZXRzLmluamVj dGVkVXNlclN0eWxlU2hlZXRzKCksIHRlbXBVc2VyU3R5bGUuZ2V0KCksIG1lZGlhUXVlcnlFdmFs dWF0b3IpOworICAgIH0gZWxzZQorICAgICAgICBjb2xsZWN0UnVsZXNGcm9tVXNlclN0eWxlU2hl ZXRzKGV4dGVuc2lvblN0eWxlU2hlZXRzLmluamVjdGVkVXNlclN0eWxlU2hlZXRzKCksIHRlbXBV c2VyU3R5bGUuZ2V0KCksIG1lZGlhUXVlcnlFdmFsdWF0b3IpOwogICAgIGNvbGxlY3RSdWxlc0Zy b21Vc2VyU3R5bGVTaGVldHMoZXh0ZW5zaW9uU3R5bGVTaGVldHMuZG9jdW1lbnRVc2VyU3R5bGVT aGVldHMoKSwgdGVtcFVzZXJTdHlsZS5nZXQoKSwgbWVkaWFRdWVyeUV2YWx1YXRvcik7CiAgICAg aWYgKHRlbXBVc2VyU3R5bGUtPnJ1bGVDb3VudCgpID4gMCB8fCB0ZW1wVXNlclN0eWxlLT5wYWdl UnVsZXMoKS5zaXplKCkgPiAwKQogICAgICAgICBtX3VzZXJTdHlsZSA9IFdURk1vdmUodGVtcFVz ZXJTdHlsZSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggYTJhNWE5NmFiMGZhMWJiNzM5YzUzN2RlZDkwMmE4NjJhNTJlYjRhNi4uYTUzZGM2YmQy NmY1NGNiNDVlMWE2NDMyNDUxOGRlNjUyMTJmZmJjMyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTIzICBL YXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBj aGVja3MgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9ucyB3aGVuIGV2YWx1YXRpbmcgdXNlciBzdHls ZSBzaGVldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwOTM2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAyMDQyMzA+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdGVkIGNhc2VzIGJhc2VkIG9u IHRob3NlIGluIFVzZXJDb250ZW50Q29udHJvbGxlci5tbS4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbToKKyAgICAgICAg KC1bSW5BcHBCcm93c2VyU2NoZW1lSGFuZGxlciB3ZWJWaWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpd KToKKyAgICAgICAgKGV4cGVjdFNjcmlwdEV2YWx1YXRlc1RvQ29sb3IpOgorICAgICAgICAoVEVT VCk6CisKKwogMjAyMC0wMy0yMyAgQ2hyaXMgTG9yZCAgPGNsb3JkQGlnYWxpYS5jb20+CiAKICAg ICAgICAgQWRkIG1pc3NpbmcgY29tbWl0dGVyIHN0YXR1cyB0byBDaHJpcyBMb3JkIGluIGNvbnRy aWJ1dG9ycy5qc29uCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL0luQXBwQnJvd3NlclByaXZhY3kubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZhY3kubW0KaW5kZXggMDNkMzMzZTMzMWYyNjZm ZDlhZWIyOGU5NjBlNzVlYjc1YWE5ODNlYS4uM2I0ZjU5MGMzOTEwZjFkYTA2MGZiYWQ5ZWQzZTJl ZjdiZmZjMzM2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbQpAQCAtMzQsNiArMzQsOCBAQAog I2ltcG9ydCA8V2ViS2l0L1dLUHJlZmVyZW5jZXNQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQv V0tVc2VyQ29udGVudENvbnRyb2xsZXJQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJz aXRlRGF0YVN0b3JlUHJpdmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L19XS1VzZXJDb250ZW50V29y bGQuaD4KKyNpbXBvcnQgPFdlYktpdC9fV0tVc2VyU3R5bGVTaGVldC5oPgogI2ltcG9ydCA8d3Rm L1J1bkxvb3AuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC02OCw2ICs3 MCwxMCBAQCAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc3RhcnRVUkxTY2hl bWVUYXNrOihpZCA8V0tVUkxTY2hlbWVUYXNrPil0YQogICAgICAgICByZXNwb25zZSA9IEAiPHNj cmlwdD53aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SW5BcHBCcm93c2VyUHJpdmFj eS5wb3N0TWVzc2FnZShcImRvbmVcIik7PC9zY3JpcHQ+IjsKICAgICBlbHNlIGlmIChbdGFzay5y ZXF1ZXN0LlVSTC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9pbi1hcHAtYnJvd3Nlci1wcml2YWN5 LXRlc3QtdXNlci1hZ2VudC1zY3JpcHQiXSkKICAgICAgICAgcmVzcG9uc2UgPSBAIjxzY3JpcHQ+ IHdpbmRvdy53a1VzZXJTY3JpcHRJbmplY3RlZCA9IHRydWU7IDwvc2NyaXB0PiI7CisgICAgZWxz ZSBpZiAoW3Rhc2sucmVxdWVzdC5VUkwucGF0aCBpc0VxdWFsVG9TdHJpbmc6QCIvaW4tYXBwLWJy b3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzIl0pCisgICAgICAgIHJlc3BvbnNl ID0gQCI8Ym9keSBzdHlsZT0nYmFja2dyb3VuZC1jb2xvcjogcmVkOyc+PC9ib2R5PiI7CisgICAg ZWxzZSBpZiAoW3Rhc2sucmVxdWVzdC5VUkwucGF0aCBpc0VxdWFsVG9TdHJpbmc6QCIvaW4tYXBw LWJyb3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzLWlmcmFtZSJdKQorICAgICAg ICByZXNwb25zZSA9IEAiPGJvZHkgc3R5bGU9J2JhY2tncm91bmQtY29sb3I6IHJlZDsnPjxpZnJh bWUgc3JjPSdpbi1hcHAtYnJvd3NlcjovLy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5LXRlc3QtdXNl ci1zdHlsZS1zaGVldHMnPjwvaWZyYW1lPjwvYm9keT4iOwogCiAgICAgW3Rhc2sgZGlkUmVjZWl2 ZVJlc3BvbnNlOltbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2sucmVxdWVz dC5VUkwgTUlNRVR5cGU6QCJ0ZXh0L2h0bWwiIGV4cGVjdGVkQ29udGVudExlbmd0aDpyZXNwb25z ZS5sZW5ndGggdGV4dEVuY29kaW5nTmFtZTpuaWxdIGF1dG9yZWxlYXNlXV07CiAgICAgW3Rhc2sg ZGlkUmVjZWl2ZURhdGE6W3Jlc3BvbnNlIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0Vu Y29kaW5nXV07CkBAIC00MTEsNSArNDE3LDkyIEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwg SWdub3JlQXBwQm91bmREb21haW5zQWNjZXB0c1VzZXJTY3JpcHRzKQogICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKIH0KIAorc3RhdGljIE5TU3RyaW5nICpzdHlsZVNoZWV0 U291cmNlID0gQCJib2R5IHsgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW4gIWltcG9ydGFudDsgfSI7 CitzdGF0aWMgTlNTdHJpbmcgKmJhY2tncm91bmRDb2xvclNjcmlwdCA9IEAid2luZG93LmdldENv bXB1dGVkU3R5bGUoZG9jdW1lbnQuYm9keSwgbnVsbCkuZ2V0UHJvcGVydHlWYWx1ZSgnYmFja2dy b3VuZC1jb2xvcicpIjsKK3N0YXRpYyBOU1N0cmluZyAqZnJhbWVCYWNrZ3JvdW5kQ29sb3JTY3Jp cHQgPSBAIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdO YW1lKCdpZnJhbWUnKVswXS5jb250ZW50RG9jdW1lbnQuYm9keSwgbnVsbCkuZ2V0UHJvcGVydHlW YWx1ZSgnYmFja2dyb3VuZC1jb2xvcicpIjsKK3N0YXRpYyBjb25zdCBjaGFyKiByZWRJblJHQiA9 ICJyZ2IoMjU1LCAwLCAwKSI7CisKK3N0YXRpYyB2b2lkIGV4cGVjdFNjcmlwdEV2YWx1YXRlc1Rv Q29sb3IoV0tXZWJWaWV3ICp3ZWJWaWV3LCBOU1N0cmluZyAqc2NyaXB0LCBjb25zdCBjaGFyKiBj b2xvcikKK3sKKyAgICBzdGF0aWMgYm9vbCBkaWRDaGVja0JhY2tncm91bmRDb2xvcjsKKworICAg IFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpzY3JpcHQgY29tcGxldGlvbkhhbmRsZXI6Xihp ZCB2YWx1ZSwgTlNFcnJvciAqIGVycm9yKSB7CisgICAgICAgIEVYUEVDVF9UUlVFKFt2YWx1ZSBp c0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KGNvbG9yLCB2YWx1ZSk7CisgICAgICAgIGRpZENoZWNrQmFja2dyb3VuZENvbG9yID0gdHJ1ZTsK KyAgICB9XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGlkQ2hlY2tCYWNrZ3Jv dW5kQ29sb3IpOworICAgIGRpZENoZWNrQmFja2dyb3VuZENvbG9yID0gZmFsc2U7Cit9CisKK1RF U1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgTm9uQXBwQm91bmRVc2VyU3R5bGVTaGVldEZvclNwZWNp ZmljV2ViVmlld0ZhaWxzKQoreworICAgIGluaXRpYWxpemVJbkFwcEJyb3dzZXJQcml2YWN5VGVz dFNldHRpbmdzKCk7CisKKyAgICBSZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29u ZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0 XSk7CisKKyAgICBhdXRvIHNjaGVtZUhhbmRsZXIgPSBhZG9wdE5TKFtbSW5BcHBCcm93c2VyU2No ZW1lSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAgIFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVt ZUhhbmRsZXI6c2NoZW1lSGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJpbi1hcHAtYnJvd3Nl ciJdOworICAgIFtbY29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc10gX3NldEluQXBwQnJvd3NlclBy aXZhY3lFbmFibGVkOllFU107CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdL V2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29u ZmlndXJhdGlvbi5nZXQoKV0pOworICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJl cXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJpbi1hcHAtYnJvd3Nl cjovLy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5LXRlc3QtdXNlci1zdHlsZS1zaGVldHMiXV07Cisg ICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgW3dlYlZpZXcgX3Rlc3Rfd2Fp dEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOworCisgICAgUmV0YWluUHRyPF9XS1VzZXJDb250ZW50 V29ybGQ+IHdvcmxkID0gW19XS1VzZXJDb250ZW50V29ybGQgd29ybGRXaXRoTmFtZTpAIlRlc3RX b3JsZCJdOworICAgIFJldGFpblB0cjxfV0tVc2VyU3R5bGVTaGVldD4gc3R5bGVTaGVldCA9IGFk b3B0TlMoW1tfV0tVc2VyU3R5bGVTaGVldCBhbGxvY10gaW5pdFdpdGhTb3VyY2U6c3R5bGVTaGVl dFNvdXJjZSBmb3JXS1dlYlZpZXc6d2ViVmlldy5nZXQoKSBmb3JNYWluRnJhbWVPbmx5OllFUyB1 c2VyQ29udGVudFdvcmxkOndvcmxkLmdldCgpXSk7CisgICAgW1tjb25maWd1cmF0aW9uIHVzZXJD b250ZW50Q29udHJvbGxlcl0gX2FkZFVzZXJTdHlsZVNoZWV0OnN0eWxlU2hlZXQuZ2V0KCldOwor CisgICAgZXhwZWN0U2NyaXB0RXZhbHVhdGVzVG9Db2xvcih3ZWJWaWV3LmdldCgpLCBiYWNrZ3Jv dW5kQ29sb3JTY3JpcHQsIHJlZEluUkdCKTsKK30KKworVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5 LCBOb25BcHBCb3VuZFVzZXJTdHlsZVNoZWV0Rm9yQWxsV2ViVmlld3NGYWlscykKK3sKKyAgICBp bml0aWFsaXplSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOworCisgICAgUmV0YWlu UHRyPFdLV2ViVmlld0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworCisgICAgYXV0byBzY2hlbWVIYW5k bGVyID0gYWRvcHROUyhbW0luQXBwQnJvd3NlclNjaGVtZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsK KyAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOnNjaGVtZUhhbmRsZXIuZ2V0 KCkgZm9yVVJMU2NoZW1lOkAiaW4tYXBwLWJyb3dzZXIiXTsKKyAgICBbW2NvbmZpZ3VyYXRpb24g cHJlZmVyZW5jZXNdIF9zZXRJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZDpZRVNdOworCisgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBO U1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VS TCBVUkxXaXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFj eS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJl cXVlc3RdOworICAgIFt3ZWJWaWV3IF90ZXN0X3dhaXRGb3JEaWRGaW5pc2hOYXZpZ2F0aW9uXTsK KworICAgIFJldGFpblB0cjxfV0tVc2VyU3R5bGVTaGVldD4gc3R5bGVTaGVldCA9IGFkb3B0TlMo W1tfV0tVc2VyU3R5bGVTaGVldCBhbGxvY10gaW5pdFdpdGhTb3VyY2U6c3R5bGVTaGVldFNvdXJj ZSBmb3JNYWluRnJhbWVPbmx5OllFU10pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVu dENvbnRyb2xsZXJdIF9hZGRVc2VyU3R5bGVTaGVldDpzdHlsZVNoZWV0LmdldCgpXTsKKworICAg IGV4cGVjdFNjcmlwdEV2YWx1YXRlc1RvQ29sb3Iod2ViVmlldy5nZXQoKSwgYmFja2dyb3VuZENv bG9yU2NyaXB0LCByZWRJblJHQik7Cit9CisKK1RFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgTm9u QXBwQm91bmRVc2VyU3R5bGVTaGVldEFmZmVjdGluZ0FsbEZyYW1lc0ZhaWxzKQoreworICAgIGlu aXRpYWxpemVJbkFwcEJyb3dzZXJQcml2YWN5VGVzdFNldHRpbmdzKCk7CisKKyAgICBSZXRhaW5Q dHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dl YlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisKKyAgICBhdXRvIHNjaGVtZUhhbmRs ZXIgPSBhZG9wdE5TKFtbSW5BcHBCcm93c2VyU2NoZW1lSGFuZGxlciBhbGxvY10gaW5pdF0pOwor ICAgIFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6c2NoZW1lSGFuZGxlci5nZXQo KSBmb3JVUkxTY2hlbWU6QCJpbi1hcHAtYnJvd3NlciJdOworICAgIFtbY29uZmlndXJhdGlvbiBw cmVmZXJlbmNlc10gX3NldEluQXBwQnJvd3NlclByaXZhY3lFbmFibGVkOllFU107CisKKyAgICBh dXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFt ZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIE5T VVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJM IFVSTFdpdGhTdHJpbmc6QCJpbi1hcHAtYnJvd3NlcjovLy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5 LXRlc3QtdXNlci1zdHlsZS1zaGVldHMtaWZyYW1lIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnJlcXVlc3RdOworICAgIFt3ZWJWaWV3IF90ZXN0X3dhaXRGb3JEaWRGaW5pc2hOYXZpZ2F0 aW9uXTsKKworICAgIFJldGFpblB0cjxfV0tVc2VyU3R5bGVTaGVldD4gc3R5bGVTaGVldCA9IGFk b3B0TlMoW1tfV0tVc2VyU3R5bGVTaGVldCBhbGxvY10gaW5pdFdpdGhTb3VyY2U6c3R5bGVTaGVl dFNvdXJjZSBmb3JNYWluRnJhbWVPbmx5Ok5PXSk7CisgICAgW1tjb25maWd1cmF0aW9uIHVzZXJD b250ZW50Q29udHJvbGxlcl0gX2FkZFVzZXJTdHlsZVNoZWV0OnN0eWxlU2hlZXQuZ2V0KCldOwor CisgICAgLy8gVGhlIG1haW4gZnJhbWUgc2hvdWxkIGJlIGFmZmVjdGVkLgorICAgIGV4cGVjdFNj cmlwdEV2YWx1YXRlc1RvQ29sb3Iod2ViVmlldy5nZXQoKSwgYmFja2dyb3VuZENvbG9yU2NyaXB0 LCByZWRJblJHQik7CisKKyAgICAvLyBUaGUgc3ViZnJhbWUgc2hvdWxkIGFsc28gYmUgYWZmZWN0 ZWQuCisgICAgZXhwZWN0U2NyaXB0RXZhbHVhdGVzVG9Db2xvcih3ZWJWaWV3LmdldCgpLCBmcmFt ZUJhY2tncm91bmRDb2xvclNjcmlwdCwgcmVkSW5SR0IpOworfQorCiAjZW5kaWYgLy8gVVNFKEFQ UExFX0lOVEVSTkFMX1NESykKIAo= 394266 2020-03-23 09:32:28 -0700 2020-03-23 11:11:42 -0700 Patch bug-209368-20200323093227.patch text/plain 11136 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFkNGFkNTE3NzE0M2Nk NjUzODU1ZjYzYTdhZWI3YTJlMmNlNDJmMy4uYzZmZmQ4NDJhYTkyZDhhNDMzZDVkMGMyYTIxNGFj YjMzM2QzYmMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTIzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBjaGVj a3MgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9ucyB3aGVuIGV2YWx1YXRpbmcgdXNlciBzdHlsZSBz aGVldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw OTM2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAyMDQyMzA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6aW5qZWN0VXNlclN0eWxlU2hlZXQpOgorICAgICAgICBJZiB0aGUg c3R5bGUgc2hlZXQgaXMgZm9yIGEgc3BlY2lmaWMgV2ViVmlldywgaXQgd2lsbCBoYXZlIGEgcGFn ZUlECisgICAgICAgIGFuZCB3ZSBjYW4gY2hlY2sgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9uIGlu IHRoZSBwYWdlIG9iamVjdC4KKworICAgICAgICAqIHN0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVSdWxlU2V0czo6aW5pdGlhbGl6ZVVz ZXJTdHlsZSk6CisgICAgICAgIElmIHRoZSB1c2VyIHN0eWxlIHNoZWV0IGlzIGJlaW5nIGFwcGxp ZWQgdG8gYWxsIFdlYlZpZXdzLCB3ZSBjYW4gY2hlY2sgZm9yIAorICAgICAgICBmb3IgYSBwYWdl J3MgZXhpc3RlbmNlIGFuZCBuYXZpZ2F0aW9uIHN0YXRlIGhlcmUgYmVmb3JlIHRoZSBzdHlsZSBz aGVldCBpcworICAgICAgICB1cGRhdGVkLgorCiAyMDIwLTAzLTIzICBBbnRvaW5lIFF1aW50ICA8 Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25zXSBSZWZhY3RvciBj YW5jZWxEZWNsYXJhdGl2ZUFuaW1hdGlvbnNGb3JFbGVtZW50IGFuZCB3aWxsRGVzdHJveVJlbmRl cmVyRm9yRWxlbWVudCBvbiBBbmltYXRpb25UaW1lbGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXgg Yjc2Y2JhMjBiOTE2ZGVhODZmODgyOTE3NTdlNTBkMWY4Y2U4MzgyMy4uNzczNmVlYjdhMTVjNGI5 M2FmY2MzN2E3MzFmYjkwNDRmYWU0YWNhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0zMDc1LDYg KzMwNzUsOSBAQCB2b2lkIFBhZ2U6OnJldmVhbEN1cnJlbnRTZWxlY3Rpb24oKQogCiB2b2lkIFBh Z2U6OmluamVjdFVzZXJTdHlsZVNoZWV0KFVzZXJTdHlsZVNoZWV0JiB1c2VyU3R5bGVTaGVldCkK IHsKKyAgICBpZiAobV9tYWluRnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLmhhc05hdmlnYXRlZEF3 YXlGcm9tQXBwQm91bmREb21haW4oKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gV2UgbmVl ZCB0byB3YWl0IHVudGlsIHdlJ3JlIG5vIGxvbmdlciBkaXNwbGF5aW5nIHRoZSBpbml0aWFsIGVt cHR5IGRvY3VtZW50IGJlZm9yZSB3ZSBjYW4gaW5qZWN0IHRoZSBzdHlsZXNoZWV0cy4KICAgICBp ZiAobV9tYWluRnJhbWUtPmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLmlzRGlzcGxheWluZ0luaXRp YWxFbXB0eURvY3VtZW50KCkpIHsKICAgICAgICAgbV91c2VyU3R5bGVTaGVldHNQZW5kaW5nSW5q ZWN0aW9uLmFwcGVuZCh1c2VyU3R5bGVTaGVldCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVTY29wZVJ1bGVTZXRzLmNwcAppbmRleCBkYjNiMmJhYWExNTUzNDRhYTViMjI5YjVlM2M0ZDdi M2YxMDU5MThjLi5iMTQ1NTdmM2YxNTljM2FhMzc5MWQ3ZDk0ZTJiZGFiMTU3NjdjOGVmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKQEAgLTMxLDcgKzMx LDExIEBACiAKICNpbmNsdWRlICJDU1NTdHlsZVNoZWV0LmgiCiAjaW5jbHVkZSAiRXh0ZW5zaW9u U3R5bGVTaGVldHMuaCIKKyNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIkZyYW1lTG9hZGVy LmgiCisjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJNZWRpYVF1ZXJ5 RXZhbHVhdG9yLmgiCisjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIu aCIKICNpbmNsdWRlICJTdHlsZVNoZWV0Q29udGVudHMuaCIKIApAQCAtODcsNyArOTEsMTEgQEAg dm9pZCBTY29wZVJ1bGVTZXRzOjppbml0aWFsaXplVXNlclN0eWxlKCkKICAgICBhdXRvIHRlbXBV c2VyU3R5bGUgPSBSdWxlU2V0OjpjcmVhdGUoKTsKICAgICBpZiAoQ1NTU3R5bGVTaGVldCogcGFn ZVVzZXJTaGVldCA9IGV4dGVuc2lvblN0eWxlU2hlZXRzLnBhZ2VVc2VyU2hlZXQoKSkKICAgICAg ICAgdGVtcFVzZXJTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQocGFnZVVzZXJTaGVldC0+Y29udGVu dHMoKSwgbnVsbHB0ciwgbWVkaWFRdWVyeUV2YWx1YXRvciwgbV9zdHlsZVJlc29sdmVyKTsKLSAg ICBjb2xsZWN0UnVsZXNGcm9tVXNlclN0eWxlU2hlZXRzKGV4dGVuc2lvblN0eWxlU2hlZXRzLmlu amVjdGVkVXNlclN0eWxlU2hlZXRzKCksIHRlbXBVc2VyU3R5bGUuZ2V0KCksIG1lZGlhUXVlcnlF dmFsdWF0b3IpOworICAgIGlmIChhdXRvKiBwYWdlID0gbV9zdHlsZVJlc29sdmVyLmRvY3VtZW50 KCkucGFnZSgpKSB7CisgICAgICAgIGlmICghcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkuY2xp ZW50KCkuaGFzTmF2aWdhdGVkQXdheUZyb21BcHBCb3VuZERvbWFpbigpKQorICAgICAgICAgICAg Y29sbGVjdFJ1bGVzRnJvbVVzZXJTdHlsZVNoZWV0cyhleHRlbnNpb25TdHlsZVNoZWV0cy5pbmpl Y3RlZFVzZXJTdHlsZVNoZWV0cygpLCB0ZW1wVXNlclN0eWxlLmdldCgpLCBtZWRpYVF1ZXJ5RXZh bHVhdG9yKTsKKyAgICB9IGVsc2UKKyAgICAgICAgY29sbGVjdFJ1bGVzRnJvbVVzZXJTdHlsZVNo ZWV0cyhleHRlbnNpb25TdHlsZVNoZWV0cy5pbmplY3RlZFVzZXJTdHlsZVNoZWV0cygpLCB0ZW1w VXNlclN0eWxlLmdldCgpLCBtZWRpYVF1ZXJ5RXZhbHVhdG9yKTsKICAgICBjb2xsZWN0UnVsZXNG cm9tVXNlclN0eWxlU2hlZXRzKGV4dGVuc2lvblN0eWxlU2hlZXRzLmRvY3VtZW50VXNlclN0eWxl U2hlZXRzKCksIHRlbXBVc2VyU3R5bGUuZ2V0KCksIG1lZGlhUXVlcnlFdmFsdWF0b3IpOwogICAg IGlmICh0ZW1wVXNlclN0eWxlLT5ydWxlQ291bnQoKSA+IDAgfHwgdGVtcFVzZXJTdHlsZS0+cGFn ZVJ1bGVzKCkuc2l6ZSgpID4gMCkKICAgICAgICAgbV91c2VyU3R5bGUgPSBXVEZNb3ZlKHRlbXBV c2VyU3R5bGUpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGEyYTVhOTZhYjBmYTFiYjczOWM1MzdkZWQ5MDJhODYyYTUyZWI0YTYuLmE1M2RjNmJk MjZmNTRjYjQ1ZTFhNjQzMjQ1MThkZTY1MjEyZmZiYzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wMy0yMyAg S2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQg Y2hlY2tzIGZvciBhcHAtYm91bmQgbmF2aWdhdGlvbnMgd2hlbiBldmFsdWF0aW5nIHVzZXIgc3R5 bGUgc2hlZXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDkzNjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwMjA0MjMwPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3RlZCBjYXNlcyBiYXNlZCBv biB0aG9zZSBpbiBVc2VyQ29udGVudENvbnRyb2xsZXIubW0uCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZhY3kubW06CisgICAgICAg ICgtW0luQXBwQnJvd3NlclNjaGVtZUhhbmRsZXIgd2ViVmlldzpzdGFydFVSTFNjaGVtZVRhc2s6 XSk6CisgICAgICAgIChleHBlY3RTY3JpcHRFdmFsdWF0ZXNUb0NvbG9yKToKKyAgICAgICAgKFRF U1QpOgorCisKIDIwMjAtMDMtMjMgIENocmlzIExvcmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAg ICAgICAgIEFkZCBtaXNzaW5nIGNvbW1pdHRlciBzdGF0dXMgdG8gQ2hyaXMgTG9yZCBpbiBjb250 cmlidXRvcnMuanNvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tCmluZGV4IDAzZDMzM2UzMzFmMjY2 ZmQ5YWViMjhlOTYwZTc1ZWI3NWFhOTgzZWEuLjNiNGY1OTBjMzkxMGYxZGEwNjBmYmFkOWVkM2Uy ZWY3YmZmYzMzNmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZhY3kubW0KQEAgLTM0LDYgKzM0LDggQEAK ICNpbXBvcnQgPFdlYktpdC9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0 L1dLVXNlckNvbnRlbnRDb250cm9sbGVyUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2Vi c2l0ZURhdGFTdG9yZVByaXZhdGUuaD4KKyNpbXBvcnQgPFdlYktpdC9fV0tVc2VyQ29udGVudFdv cmxkLmg+CisjaW1wb3J0IDxXZWJLaXQvX1dLVXNlclN0eWxlU2hlZXQuaD4KICNpbXBvcnQgPHd0 Zi9SdW5Mb29wLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNjgsNiAr NzAsMTAgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHN0YXJ0VVJMU2No ZW1lVGFzazooaWQgPFdLVVJMU2NoZW1lVGFzaz4pdGEKICAgICAgICAgcmVzcG9uc2UgPSBAIjxz Y3JpcHQ+d2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEluQXBwQnJvd3NlclByaXZh Y3kucG9zdE1lc3NhZ2UoXCJkb25lXCIpOzwvc2NyaXB0PiI7CiAgICAgZWxzZSBpZiAoW3Rhc2su cmVxdWVzdC5VUkwucGF0aCBpc0VxdWFsVG9TdHJpbmc6QCIvaW4tYXBwLWJyb3dzZXItcHJpdmFj eS10ZXN0LXVzZXItYWdlbnQtc2NyaXB0Il0pCiAgICAgICAgIHJlc3BvbnNlID0gQCI8c2NyaXB0 PiB3aW5kb3cud2tVc2VyU2NyaXB0SW5qZWN0ZWQgPSB0cnVlOyA8L3NjcmlwdD4iOworICAgIGVs c2UgaWYgKFt0YXNrLnJlcXVlc3QuVVJMLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL2luLWFwcC1i cm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0cyJdKQorICAgICAgICByZXNwb25z ZSA9IEAiPGJvZHkgc3R5bGU9J2JhY2tncm91bmQtY29sb3I6IHJlZDsnPjwvYm9keT4iOworICAg IGVsc2UgaWYgKFt0YXNrLnJlcXVlc3QuVVJMLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL2luLWFw cC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0cy1pZnJhbWUiXSkKKyAgICAg ICAgcmVzcG9uc2UgPSBAIjxib2R5IHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7Jz48aWZy YW1lIHNyYz0naW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0LXVz ZXItc3R5bGUtc2hlZXRzJz48L2lmcmFtZT48L2JvZHk+IjsKIAogICAgIFt0YXNrIGRpZFJlY2Vp dmVSZXNwb25zZTpbW1tOU1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0aFVSTDp0YXNrLnJlcXVl c3QuVVJMIE1JTUVUeXBlOkAidGV4dC9odG1sIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6cmVzcG9u c2UubGVuZ3RoIHRleHRFbmNvZGluZ05hbWU6bmlsXSBhdXRvcmVsZWFzZV1dOwogICAgIFt0YXNr IGRpZFJlY2VpdmVEYXRhOltyZXNwb25zZSBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdF bmNvZGluZ11dOwpAQCAtNDExLDUgKzQxNyw5MiBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ks IElnbm9yZUFwcEJvdW5kRG9tYWluc0FjY2VwdHNVc2VyU2NyaXB0cykKICAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmlzRG9uZSk7CiB9CiAKK3N0YXRpYyBOU1N0cmluZyAqc3R5bGVTaGVl dFNvdXJjZSA9IEAiYm9keSB7IGJhY2tncm91bmQtY29sb3I6IGdyZWVuICFpbXBvcnRhbnQ7IH0i Oworc3RhdGljIE5TU3RyaW5nICpiYWNrZ3JvdW5kQ29sb3JTY3JpcHQgPSBAIndpbmRvdy5nZXRD b21wdXRlZFN0eWxlKGRvY3VtZW50LmJvZHksIG51bGwpLmdldFByb3BlcnR5VmFsdWUoJ2JhY2tn cm91bmQtY29sb3InKSI7CitzdGF0aWMgTlNTdHJpbmcgKmZyYW1lQmFja2dyb3VuZENvbG9yU2Ny aXB0ID0gQCJ3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFn TmFtZSgnaWZyYW1lJylbMF0uY29udGVudERvY3VtZW50LmJvZHksIG51bGwpLmdldFByb3BlcnR5 VmFsdWUoJ2JhY2tncm91bmQtY29sb3InKSI7CitzdGF0aWMgY29uc3QgY2hhciogcmVkSW5SR0Ig PSAicmdiKDI1NSwgMCwgMCkiOworCitzdGF0aWMgdm9pZCBleHBlY3RTY3JpcHRFdmFsdWF0ZXNU b0NvbG9yKFdLV2ViVmlldyAqd2ViVmlldywgTlNTdHJpbmcgKnNjcmlwdCwgY29uc3QgY2hhciog Y29sb3IpCit7CisgICAgc3RhdGljIGJvb2wgZGlkQ2hlY2tCYWNrZ3JvdW5kQ29sb3I7CisKKyAg ICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6c2NyaXB0IGNvbXBsZXRpb25IYW5kbGVyOl4o aWQgdmFsdWUsIE5TRXJyb3IgKiBlcnJvcikgeworICAgICAgICBFWFBFQ1RfVFJVRShbdmFsdWUg aXNLaW5kT2ZDbGFzczpbTlNTdHJpbmcgY2xhc3NdXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShjb2xvciwgdmFsdWUpOworICAgICAgICBkaWRDaGVja0JhY2tncm91bmRDb2xvciA9IHRydWU7 CisgICAgfV07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZENoZWNrQmFja2dy b3VuZENvbG9yKTsKKyAgICBkaWRDaGVja0JhY2tncm91bmRDb2xvciA9IGZhbHNlOworfQorCitU RVNUKEluQXBwQnJvd3NlclByaXZhY3ksIE5vbkFwcEJvdW5kVXNlclN0eWxlU2hlZXRGb3JTcGVj aWZpY1dlYlZpZXdGYWlscykKK3sKKyAgICBpbml0aWFsaXplSW5BcHBCcm93c2VyUHJpdmFjeVRl c3RTZXR0aW5ncygpOworCisgICAgUmV0YWluUHRyPFdLV2ViVmlld0NvbmZpZ3VyYXRpb24+IGNv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5p dF0pOworCisgICAgYXV0byBzY2hlbWVIYW5kbGVyID0gYWRvcHROUyhbW0luQXBwQnJvd3NlclNj aGVtZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hl bWVIYW5kbGVyOnNjaGVtZUhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAiaW4tYXBwLWJyb3dz ZXIiXTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdIF9zZXRJbkFwcEJyb3dzZXJQ cml2YWN5RW5hYmxlZDpZRVNdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RX S1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9uOmNv bmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxS ZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dz ZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzIl1dOwor ICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIFt3ZWJWaWV3IF90ZXN0X3dh aXRGb3JEaWRGaW5pc2hOYXZpZ2F0aW9uXTsKKworICAgIFJldGFpblB0cjxfV0tVc2VyQ29udGVu dFdvcmxkPiB3b3JsZCA9IFtfV0tVc2VyQ29udGVudFdvcmxkIHdvcmxkV2l0aE5hbWU6QCJUZXN0 V29ybGQiXTsKKyAgICBSZXRhaW5QdHI8X1dLVXNlclN0eWxlU2hlZXQ+IHN0eWxlU2hlZXQgPSBh ZG9wdE5TKFtbX1dLVXNlclN0eWxlU2hlZXQgYWxsb2NdIGluaXRXaXRoU291cmNlOnN0eWxlU2hl ZXRTb3VyY2UgZm9yV0tXZWJWaWV3OndlYlZpZXcuZ2V0KCkgZm9yTWFpbkZyYW1lT25seTpZRVMg dXNlckNvbnRlbnRXb3JsZDp3b3JsZC5nZXQoKV0pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2Vy Q29udGVudENvbnRyb2xsZXJdIF9hZGRVc2VyU3R5bGVTaGVldDpzdHlsZVNoZWV0LmdldCgpXTsK KworICAgIGV4cGVjdFNjcmlwdEV2YWx1YXRlc1RvQ29sb3Iod2ViVmlldy5nZXQoKSwgYmFja2dy b3VuZENvbG9yU2NyaXB0LCByZWRJblJHQik7Cit9CisKK1RFU1QoSW5BcHBCcm93c2VyUHJpdmFj eSwgTm9uQXBwQm91bmRVc2VyU3R5bGVTaGVldEZvckFsbFdlYlZpZXdzRmFpbHMpCit7CisgICAg aW5pdGlhbGl6ZUluQXBwQnJvd3NlclByaXZhY3lUZXN0U2V0dGluZ3MoKTsKKworICAgIFJldGFp blB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKworICAgIGF1dG8gc2NoZW1lSGFu ZGxlciA9IGFkb3B0TlMoW1tJbkFwcEJyb3dzZXJTY2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7 CisgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdl dCgpIGZvclVSTFNjaGVtZTpAImluLWFwcC1icm93c2VyIl07CisgICAgW1tjb25maWd1cmF0aW9u IHByZWZlcmVuY2VzXSBfc2V0SW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQ6WUVTXTsKKworICAg IGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOkNHUmVjdFplcm8gY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAg TlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNV UkwgVVJMV2l0aFN0cmluZzpAImluLWFwcC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZh Y3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0cyJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpy ZXF1ZXN0XTsKKyAgICBbd2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07 CisKKyAgICBSZXRhaW5QdHI8X1dLVXNlclN0eWxlU2hlZXQ+IHN0eWxlU2hlZXQgPSBhZG9wdE5T KFtbX1dLVXNlclN0eWxlU2hlZXQgYWxsb2NdIGluaXRXaXRoU291cmNlOnN0eWxlU2hlZXRTb3Vy Y2UgZm9yTWFpbkZyYW1lT25seTpZRVNdKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNvbnRl bnRDb250cm9sbGVyXSBfYWRkVXNlclN0eWxlU2hlZXQ6c3R5bGVTaGVldC5nZXQoKV07CisKKyAg ICBleHBlY3RTY3JpcHRFdmFsdWF0ZXNUb0NvbG9yKHdlYlZpZXcuZ2V0KCksIGJhY2tncm91bmRD b2xvclNjcmlwdCwgcmVkSW5SR0IpOworfQorCitURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIE5v bkFwcEJvdW5kVXNlclN0eWxlU2hlZXRBZmZlY3RpbmdBbGxGcmFtZXNGYWlscykKK3sKKyAgICBp bml0aWFsaXplSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOworCisgICAgUmV0YWlu UHRyPFdLV2ViVmlld0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworCisgICAgYXV0byBzY2hlbWVIYW5k bGVyID0gYWRvcHROUyhbW0luQXBwQnJvd3NlclNjaGVtZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsK KyAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOnNjaGVtZUhhbmRsZXIuZ2V0 KCkgZm9yVVJMU2NoZW1lOkAiaW4tYXBwLWJyb3dzZXIiXTsKKyAgICBbW2NvbmZpZ3VyYXRpb24g cHJlZmVyZW5jZXNdIF9zZXRJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZDpZRVNdOworCisgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBO U1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VS TCBVUkxXaXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFj eS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzLWlmcmFtZSJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVx dWVzdDpyZXF1ZXN0XTsKKyAgICBbd2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdh dGlvbl07CisKKyAgICBSZXRhaW5QdHI8X1dLVXNlclN0eWxlU2hlZXQ+IHN0eWxlU2hlZXQgPSBh ZG9wdE5TKFtbX1dLVXNlclN0eWxlU2hlZXQgYWxsb2NdIGluaXRXaXRoU291cmNlOnN0eWxlU2hl ZXRTb3VyY2UgZm9yTWFpbkZyYW1lT25seTpOT10pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2Vy Q29udGVudENvbnRyb2xsZXJdIF9hZGRVc2VyU3R5bGVTaGVldDpzdHlsZVNoZWV0LmdldCgpXTsK KworICAgIC8vIFRoZSBtYWluIGZyYW1lIHNob3VsZCBiZSBhZmZlY3RlZC4KKyAgICBleHBlY3RT Y3JpcHRFdmFsdWF0ZXNUb0NvbG9yKHdlYlZpZXcuZ2V0KCksIGJhY2tncm91bmRDb2xvclNjcmlw dCwgcmVkSW5SR0IpOworCisgICAgLy8gVGhlIHN1YmZyYW1lIHNob3VsZCBhbHNvIGJlIGFmZmVj dGVkLgorICAgIGV4cGVjdFNjcmlwdEV2YWx1YXRlc1RvQ29sb3Iod2ViVmlldy5nZXQoKSwgZnJh bWVCYWNrZ3JvdW5kQ29sb3JTY3JpcHQsIHJlZEluUkdCKTsKK30KKwogI2VuZGlmIC8vIFVTRShB UFBMRV9JTlRFUk5BTF9TREspCiAK 394279 2020-03-23 11:11:44 -0700 2020-03-23 11:47:54 -0700 Patch for landing bug-209368-20200323111143.patch text/plain 11365 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFkNGFkNTE3NzE0M2Nk NjUzODU1ZjYzYTdhZWI3YTJlMmNlNDJmMy4uMTViNGI1NmRmYmQ0ZTMxMzZiNTQ1OWEzMmYzYjY1 YTJiMTAwYmQ0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTIzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBjaGVj a3MgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9ucyB3aGVuIGV2YWx1YXRpbmcgdXNlciBzdHlsZSBz aGVldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw OTM2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAyMDQyMzA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQYWdlOjppbmplY3RVc2VyU3R5bGVTaGVldCk6CisgICAgICAgIElmIHRoZSBz dHlsZSBzaGVldCBpcyBmb3IgYSBzcGVjaWZpYyBXZWJWaWV3LCBpdCB3aWxsIGhhdmUgYSBwYWdl SUQKKyAgICAgICAgYW5kIHdlIGNhbiBjaGVjayBmb3IgYXBwLWJvdW5kIG5hdmlnYXRpb24gaW4g dGhlIHBhZ2Ugb2JqZWN0LgorCisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZVJ1bGVTZXRzOjppbml0aWFsaXplVXNl clN0eWxlKToKKyAgICAgICAgSWYgdGhlIHVzZXIgc3R5bGUgc2hlZXQgaXMgYmVpbmcgYXBwbGll ZCB0byBhbGwgV2ViVmlld3MsIHdlIGNhbiBjaGVjayBmb3IgCisgICAgICAgIGZvciBhIHBhZ2Un cyBleGlzdGVuY2UgYW5kIG5hdmlnYXRpb24gc3RhdGUgaGVyZSBiZWZvcmUgdGhlIHN0eWxlIHNo ZWV0IGlzCisgICAgICAgIHVwZGF0ZWQuCisKIDIwMjAtMDMtMjMgIEFudG9pbmUgUXVpbnQgIDxn cmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIFJlZmFjdG9yIGNh bmNlbERlY2xhcmF0aXZlQW5pbWF0aW9uc0ZvckVsZW1lbnQgYW5kIHdpbGxEZXN0cm95UmVuZGVy ZXJGb3JFbGVtZW50IG9uIEFuaW1hdGlvblRpbWVsaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCBi NzZjYmEyMGI5MTZkZWE4NmY4ODI5MTc1N2U1MGQxZjhjZTgzODIzLi5lN2RkMjRhMzExYWI3NDVk ZTU2YzY4ZDJlY2VhMzBmMjYwNzRhM2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTMwNzUsNiAr MzA3NSwxMiBAQCB2b2lkIFBhZ2U6OnJldmVhbEN1cnJlbnRTZWxlY3Rpb24oKQogCiB2b2lkIFBh Z2U6OmluamVjdFVzZXJTdHlsZVNoZWV0KFVzZXJTdHlsZVNoZWV0JiB1c2VyU3R5bGVTaGVldCkK IHsKKyAgICBpZiAobV9tYWluRnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLmhhc05hdmlnYXRlZEF3 YXlGcm9tQXBwQm91bmREb21haW4oKSkgeworICAgICAgICBpZiAoYXV0byogZG9jdW1lbnQgPSBt X21haW5GcmFtZS0+ZG9jdW1lbnQoKSkKKyAgICAgICAgICAgIGRvY3VtZW50LT5hZGRDb25zb2xl TWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpXYXJuaW5nLCAi SWdub3JpbmcgdXNlciBzdHlsZSBzaGVldCBmb3Igbm9uLWFwcCBib3VuZCBkb21haW4uIl9zKTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIC8vIFdlIG5lZWQgdG8gd2FpdCB1bnRpbCB3 ZSdyZSBubyBsb25nZXIgZGlzcGxheWluZyB0aGUgaW5pdGlhbCBlbXB0eSBkb2N1bWVudCBiZWZv cmUgd2UgY2FuIGluamVjdCB0aGUgc3R5bGVzaGVldHMuCiAgICAgaWYgKG1fbWFpbkZyYW1lLT5s b2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5pc0Rpc3BsYXlpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgp KSB7CiAgICAgICAgIG1fdXNlclN0eWxlU2hlZXRzUGVuZGluZ0luamVjdGlvbi5hcHBlbmQodXNl clN0eWxlU2hlZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29w ZVJ1bGVTZXRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5j cHAKaW5kZXggZGIzYjJiYWFhMTU1MzQ0YWE1YjIyOWI1ZTNjNGQ3YjNmMTA1OTE4Yy4uZjMyNzBk MTVhMWE4ZGM1MWYwZTBhY2IwNGNmMmI0YzM5NDRmYTdjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwCkBAIC0zMSw3ICszMSwxMSBAQAogCiAjaW5jbHVk ZSAiQ1NTU3R5bGVTaGVldC5oIgogI2luY2x1ZGUgIkV4dGVuc2lvblN0eWxlU2hlZXRzLmgiCisj aW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgorI2luY2x1ZGUgIkZy YW1lTG9hZGVyQ2xpZW50LmgiCiAjaW5jbHVkZSAiTWVkaWFRdWVyeUV2YWx1YXRvci5oIgorI2lu Y2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAjaW5jbHVkZSAiU3R5 bGVTaGVldENvbnRlbnRzLmgiCiAKQEAgLTg3LDcgKzkxLDExIEBAIHZvaWQgU2NvcGVSdWxlU2V0 czo6aW5pdGlhbGl6ZVVzZXJTdHlsZSgpCiAgICAgYXV0byB0ZW1wVXNlclN0eWxlID0gUnVsZVNl dDo6Y3JlYXRlKCk7CiAgICAgaWYgKENTU1N0eWxlU2hlZXQqIHBhZ2VVc2VyU2hlZXQgPSBleHRl bnNpb25TdHlsZVNoZWV0cy5wYWdlVXNlclNoZWV0KCkpCiAgICAgICAgIHRlbXBVc2VyU3R5bGUt PmFkZFJ1bGVzRnJvbVNoZWV0KHBhZ2VVc2VyU2hlZXQtPmNvbnRlbnRzKCksIG51bGxwdHIsIG1l ZGlhUXVlcnlFdmFsdWF0b3IsIG1fc3R5bGVSZXNvbHZlcik7Ci0gICAgY29sbGVjdFJ1bGVzRnJv bVVzZXJTdHlsZVNoZWV0cyhleHRlbnNpb25TdHlsZVNoZWV0cy5pbmplY3RlZFVzZXJTdHlsZVNo ZWV0cygpLCB0ZW1wVXNlclN0eWxlLmdldCgpLCBtZWRpYVF1ZXJ5RXZhbHVhdG9yKTsKKyAgICBh dXRvKiBwYWdlID0gbV9zdHlsZVJlc29sdmVyLmRvY3VtZW50KCkucGFnZSgpOworICAgIGlmIChw YWdlICYmIHBhZ2UtPm1haW5GcmFtZSgpLmxvYWRlcigpLmNsaWVudCgpLmhhc05hdmlnYXRlZEF3 YXlGcm9tQXBwQm91bmREb21haW4oKSkKKyAgICAgICAgbV9zdHlsZVJlc29sdmVyLmRvY3VtZW50 KCkuYWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZl bDo6V2FybmluZywgIklnbm9yaW5nIHVzZXIgc3R5bGUgc2hlZXQgZm9yIG5vbi1hcHAgYm91bmQg ZG9tYWluLiJfcyk7CisgICAgZWxzZQorICAgICAgICBjb2xsZWN0UnVsZXNGcm9tVXNlclN0eWxl U2hlZXRzKGV4dGVuc2lvblN0eWxlU2hlZXRzLmluamVjdGVkVXNlclN0eWxlU2hlZXRzKCksIHRl bXBVc2VyU3R5bGUuZ2V0KCksIG1lZGlhUXVlcnlFdmFsdWF0b3IpOwogICAgIGNvbGxlY3RSdWxl c0Zyb21Vc2VyU3R5bGVTaGVldHMoZXh0ZW5zaW9uU3R5bGVTaGVldHMuZG9jdW1lbnRVc2VyU3R5 bGVTaGVldHMoKSwgdGVtcFVzZXJTdHlsZS5nZXQoKSwgbWVkaWFRdWVyeUV2YWx1YXRvcik7CiAg ICAgaWYgKHRlbXBVc2VyU3R5bGUtPnJ1bGVDb3VudCgpID4gMCB8fCB0ZW1wVXNlclN0eWxlLT5w YWdlUnVsZXMoKS5zaXplKCkgPiAwKQogICAgICAgICBtX3VzZXJTdHlsZSA9IFdURk1vdmUodGVt cFVzZXJTdHlsZSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggYTJhNWE5NmFiMGZhMWJiNzM5YzUzN2RlZDkwMmE4NjJhNTJlYjRhNi4uMGQ3ZWM1 ZGRkYTQ1NzZmYzA4N2M4MTk5YjdmOWZkZTQ1Y2M0MzcwNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTIz ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBjaGVja3MgZm9yIGFwcC1ib3VuZCBuYXZpZ2F0aW9ucyB3aGVuIGV2YWx1YXRpbmcgdXNlciBz dHlsZSBzaGVldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwOTM2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAyMDQyMzA+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBUZXN0ZWQgY2FzZXMgYmFzZWQg b24gdGhvc2UgaW4gVXNlckNvbnRlbnRDb250cm9sbGVyLm1tLgorCisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tOgorICAgICAg ICAoLVtJbkFwcEJyb3dzZXJTY2hlbWVIYW5kbGVyIHdlYlZpZXc6c3RhcnRVUkxTY2hlbWVUYXNr Ol0pOgorICAgICAgICAoZXhwZWN0U2NyaXB0RXZhbHVhdGVzVG9Db2xvcik6CisgICAgICAgIChU RVNUKToKKworCiAyMDIwLTAzLTIzICBDaHJpcyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KIAog ICAgICAgICBBZGQgbWlzc2luZyBjb21taXR0ZXIgc3RhdHVzIHRvIENocmlzIExvcmQgaW4gY29u dHJpYnV0b3JzLmpzb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbQppbmRleCAwM2QzMzNlMzMxZjI2 NmZkOWFlYjI4ZTk2MGU3NWViNzVhYTk4M2VhLi4zYjRmNTkwYzM5MTBmMWRhMDYwZmJhZDllZDNl MmVmN2JmZmMzMzZmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL0luQXBwQnJvd3NlclByaXZhY3kubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tCkBAIC0zNCw2ICszNCw4IEBA CiAjaW1wb3J0IDxXZWJLaXQvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktp dC9XS1VzZXJDb250ZW50Q29udHJvbGxlclByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dl YnNpdGVEYXRhU3RvcmVQcml2YXRlLmg+CisjaW1wb3J0IDxXZWJLaXQvX1dLVXNlckNvbnRlbnRX b3JsZC5oPgorI2ltcG9ydCA8V2ViS2l0L19XS1VzZXJTdHlsZVNoZWV0Lmg+CiAjaW1wb3J0IDx3 dGYvUnVuTG9vcC5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTY4LDYg KzcwLDEwIEBAIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzdGFydFVSTFNj aGVtZVRhc2s6KGlkIDxXS1VSTFNjaGVtZVRhc2s+KXRhCiAgICAgICAgIHJlc3BvbnNlID0gQCI8 c2NyaXB0PndpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RJbkFwcEJyb3dzZXJQcml2 YWN5LnBvc3RNZXNzYWdlKFwiZG9uZVwiKTs8L3NjcmlwdD4iOwogICAgIGVsc2UgaWYgKFt0YXNr LnJlcXVlc3QuVVJMLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL2luLWFwcC1icm93c2VyLXByaXZh Y3ktdGVzdC11c2VyLWFnZW50LXNjcmlwdCJdKQogICAgICAgICByZXNwb25zZSA9IEAiPHNjcmlw dD4gd2luZG93LndrVXNlclNjcmlwdEluamVjdGVkID0gdHJ1ZTsgPC9zY3JpcHQ+IjsKKyAgICBl bHNlIGlmIChbdGFzay5yZXF1ZXN0LlVSTC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9pbi1hcHAt YnJvd3Nlci1wcml2YWN5LXRlc3QtdXNlci1zdHlsZS1zaGVldHMiXSkKKyAgICAgICAgcmVzcG9u c2UgPSBAIjxib2R5IHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7Jz48L2JvZHk+IjsKKyAg ICBlbHNlIGlmIChbdGFzay5yZXF1ZXN0LlVSTC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9pbi1h cHAtYnJvd3Nlci1wcml2YWN5LXRlc3QtdXNlci1zdHlsZS1zaGVldHMtaWZyYW1lIl0pCisgICAg ICAgIHJlc3BvbnNlID0gQCI8Ym9keSBzdHlsZT0nYmFja2dyb3VuZC1jb2xvcjogcmVkOyc+PGlm cmFtZSBzcmM9J2luLWFwcC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11 c2VyLXN0eWxlLXNoZWV0cyc+PC9pZnJhbWU+PC9ib2R5PiI7CiAKICAgICBbdGFzayBkaWRSZWNl aXZlUmVzcG9uc2U6W1tbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1 ZXN0LlVSTCBNSU1FVHlwZTpAInRleHQvaHRtbCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOnJlc3Bv bnNlLmxlbmd0aCB0ZXh0RW5jb2RpbmdOYW1lOm5pbF0gYXV0b3JlbGVhc2VdXTsKICAgICBbdGFz ayBkaWRSZWNlaXZlRGF0YTpbcmVzcG9uc2UgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5n RW5jb2RpbmddXTsKQEAgLTQxMSw1ICs0MTcsOTIgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5 LCBJZ25vcmVBcHBCb3VuZERvbWFpbnNBY2NlcHRzVXNlclNjcmlwdHMpCiAgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZpc0RvbmUpOwogfQogCitzdGF0aWMgTlNTdHJpbmcgKnN0eWxlU2hl ZXRTb3VyY2UgPSBAImJvZHkgeyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbiAhaW1wb3J0YW50OyB9 IjsKK3N0YXRpYyBOU1N0cmluZyAqYmFja2dyb3VuZENvbG9yU2NyaXB0ID0gQCJ3aW5kb3cuZ2V0 Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5ib2R5LCBudWxsKS5nZXRQcm9wZXJ0eVZhbHVlKCdiYWNr Z3JvdW5kLWNvbG9yJykiOworc3RhdGljIE5TU3RyaW5nICpmcmFtZUJhY2tncm91bmRDb2xvclNj cmlwdCA9IEAid2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRh Z05hbWUoJ2lmcmFtZScpWzBdLmNvbnRlbnREb2N1bWVudC5ib2R5LCBudWxsKS5nZXRQcm9wZXJ0 eVZhbHVlKCdiYWNrZ3JvdW5kLWNvbG9yJykiOworc3RhdGljIGNvbnN0IGNoYXIqIHJlZEluUkdC ID0gInJnYigyNTUsIDAsIDApIjsKKworc3RhdGljIHZvaWQgZXhwZWN0U2NyaXB0RXZhbHVhdGVz VG9Db2xvcihXS1dlYlZpZXcgKndlYlZpZXcsIE5TU3RyaW5nICpzY3JpcHQsIGNvbnN0IGNoYXIq IGNvbG9yKQoreworICAgIHN0YXRpYyBib29sIGRpZENoZWNrQmFja2dyb3VuZENvbG9yOworCisg ICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OnNjcmlwdCBjb21wbGV0aW9uSGFuZGxlcjpe KGlkIHZhbHVlLCBOU0Vycm9yICogZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1RSVUUoW3ZhbHVl IGlzS2luZE9mQ2xhc3M6W05TU3RyaW5nIGNsYXNzXV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RS RVEoY29sb3IsIHZhbHVlKTsKKyAgICAgICAgZGlkQ2hlY2tCYWNrZ3JvdW5kQ29sb3IgPSB0cnVl OworICAgIH1dOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRDaGVja0JhY2tn cm91bmRDb2xvcik7CisgICAgZGlkQ2hlY2tCYWNrZ3JvdW5kQ29sb3IgPSBmYWxzZTsKK30KKwor VEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBOb25BcHBCb3VuZFVzZXJTdHlsZVNoZWV0Rm9yU3Bl Y2lmaWNXZWJWaWV3RmFpbHMpCit7CisgICAgaW5pdGlhbGl6ZUluQXBwQnJvd3NlclByaXZhY3lU ZXN0U2V0dGluZ3MoKTsKKworICAgIFJldGFpblB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBj b25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGlu aXRdKTsKKworICAgIGF1dG8gc2NoZW1lSGFuZGxlciA9IGFkb3B0TlMoW1tJbkFwcEJyb3dzZXJT Y2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2No ZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAImluLWFwcC1icm93 c2VyIl07CisgICAgW1tjb25maWd1cmF0aW9uIHByZWZlcmVuY2VzXSBfc2V0SW5BcHBCcm93c2Vy UHJpdmFjeUVuYWJsZWQ6WUVTXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0 V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdFplcm8gY29uZmlndXJhdGlvbjpj b25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJM UmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImluLWFwcC1icm93 c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0cyJdXTsK KyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKyAgICBbd2ViVmlldyBfdGVzdF93 YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CisKKyAgICBSZXRhaW5QdHI8X1dLVXNlckNvbnRl bnRXb3JsZD4gd29ybGQgPSBbX1dLVXNlckNvbnRlbnRXb3JsZCB3b3JsZFdpdGhOYW1lOkAiVGVz dFdvcmxkIl07CisgICAgUmV0YWluUHRyPF9XS1VzZXJTdHlsZVNoZWV0PiBzdHlsZVNoZWV0ID0g YWRvcHROUyhbW19XS1VzZXJTdHlsZVNoZWV0IGFsbG9jXSBpbml0V2l0aFNvdXJjZTpzdHlsZVNo ZWV0U291cmNlIGZvcldLV2ViVmlldzp3ZWJWaWV3LmdldCgpIGZvck1haW5GcmFtZU9ubHk6WUVT IHVzZXJDb250ZW50V29ybGQ6d29ybGQuZ2V0KCldKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gdXNl ckNvbnRlbnRDb250cm9sbGVyXSBfYWRkVXNlclN0eWxlU2hlZXQ6c3R5bGVTaGVldC5nZXQoKV07 CisKKyAgICBleHBlY3RTY3JpcHRFdmFsdWF0ZXNUb0NvbG9yKHdlYlZpZXcuZ2V0KCksIGJhY2tn cm91bmRDb2xvclNjcmlwdCwgcmVkSW5SR0IpOworfQorCitURVNUKEluQXBwQnJvd3NlclByaXZh Y3ksIE5vbkFwcEJvdW5kVXNlclN0eWxlU2hlZXRGb3JBbGxXZWJWaWV3c0ZhaWxzKQoreworICAg IGluaXRpYWxpemVJbkFwcEJyb3dzZXJQcml2YWN5VGVzdFNldHRpbmdzKCk7CisKKyAgICBSZXRh aW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tX S1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisKKyAgICBhdXRvIHNjaGVtZUhh bmRsZXIgPSBhZG9wdE5TKFtbSW5BcHBCcm93c2VyU2NoZW1lSGFuZGxlciBhbGxvY10gaW5pdF0p OworICAgIFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6c2NoZW1lSGFuZGxlci5n ZXQoKSBmb3JVUkxTY2hlbWU6QCJpbi1hcHAtYnJvd3NlciJdOworICAgIFtbY29uZmlndXJhdGlv biBwcmVmZXJlbmNlc10gX3NldEluQXBwQnJvd3NlclByaXZhY3lFbmFibGVkOllFU107CisKKyAg ICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOworICAg IE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05T VVJMIFVSTFdpdGhTdHJpbmc6QCJpbi1hcHAtYnJvd3NlcjovLy9pbi1hcHAtYnJvd3Nlci1wcml2 YWN5LXRlc3QtdXNlci1zdHlsZS1zaGVldHMiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6 cmVxdWVzdF07CisgICAgW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25d OworCisgICAgUmV0YWluUHRyPF9XS1VzZXJTdHlsZVNoZWV0PiBzdHlsZVNoZWV0ID0gYWRvcHRO UyhbW19XS1VzZXJTdHlsZVNoZWV0IGFsbG9jXSBpbml0V2l0aFNvdXJjZTpzdHlsZVNoZWV0U291 cmNlIGZvck1haW5GcmFtZU9ubHk6WUVTXSk7CisgICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250 ZW50Q29udHJvbGxlcl0gX2FkZFVzZXJTdHlsZVNoZWV0OnN0eWxlU2hlZXQuZ2V0KCldOworCisg ICAgZXhwZWN0U2NyaXB0RXZhbHVhdGVzVG9Db2xvcih3ZWJWaWV3LmdldCgpLCBiYWNrZ3JvdW5k Q29sb3JTY3JpcHQsIHJlZEluUkdCKTsKK30KKworVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBO b25BcHBCb3VuZFVzZXJTdHlsZVNoZWV0QWZmZWN0aW5nQWxsRnJhbWVzRmFpbHMpCit7CisgICAg aW5pdGlhbGl6ZUluQXBwQnJvd3NlclByaXZhY3lUZXN0U2V0dGluZ3MoKTsKKworICAgIFJldGFp blB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKworICAgIGF1dG8gc2NoZW1lSGFu ZGxlciA9IGFkb3B0TlMoW1tJbkFwcEJyb3dzZXJTY2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7 CisgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdl dCgpIGZvclVSTFNjaGVtZTpAImluLWFwcC1icm93c2VyIl07CisgICAgW1tjb25maWd1cmF0aW9u IHByZWZlcmVuY2VzXSBfc2V0SW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQ6WUVTXTsKKworICAg IGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOkNHUmVjdFplcm8gY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAg TlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNV UkwgVVJMV2l0aFN0cmluZzpAImluLWFwcC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZh Y3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0cy1pZnJhbWUiXV07CisgICAgW3dlYlZpZXcgbG9hZFJl cXVlc3Q6cmVxdWVzdF07CisgICAgW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckRpZEZpbmlzaE5hdmln YXRpb25dOworCisgICAgUmV0YWluUHRyPF9XS1VzZXJTdHlsZVNoZWV0PiBzdHlsZVNoZWV0ID0g YWRvcHROUyhbW19XS1VzZXJTdHlsZVNoZWV0IGFsbG9jXSBpbml0V2l0aFNvdXJjZTpzdHlsZVNo ZWV0U291cmNlIGZvck1haW5GcmFtZU9ubHk6Tk9dKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gdXNl ckNvbnRlbnRDb250cm9sbGVyXSBfYWRkVXNlclN0eWxlU2hlZXQ6c3R5bGVTaGVldC5nZXQoKV07 CisKKyAgICAvLyBUaGUgbWFpbiBmcmFtZSBzaG91bGQgYmUgYWZmZWN0ZWQuCisgICAgZXhwZWN0 U2NyaXB0RXZhbHVhdGVzVG9Db2xvcih3ZWJWaWV3LmdldCgpLCBiYWNrZ3JvdW5kQ29sb3JTY3Jp cHQsIHJlZEluUkdCKTsKKworICAgIC8vIFRoZSBzdWJmcmFtZSBzaG91bGQgYWxzbyBiZSBhZmZl Y3RlZC4KKyAgICBleHBlY3RTY3JpcHRFdmFsdWF0ZXNUb0NvbG9yKHdlYlZpZXcuZ2V0KCksIGZy YW1lQmFja2dyb3VuZENvbG9yU2NyaXB0LCByZWRJblJHQik7Cit9CisKICNlbmRpZiAvLyBVU0Uo QVBQTEVfSU5URVJOQUxfU0RLKQogCg==