224175 2021-04-04 20:33:43 -0700 REGRESSION(r275267) [GLIB] API test /webkit/WebKitWebsiteData/configuration is failing 2021-12-19 20:13:54 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=223808 https://bugs.webkit.org/show_bug.cgi?id=234497 P2 Normal --- 1 lmoura lmoura bugs-noreply cgarcia webkit-bug-importer oldest_to_newest 1746888 0 lmoura 2021-04-04 20:33:43 -0700 /WPE/TestWebsiteData /webkit/WebKitWebsiteData/configuration To run the single test case in GTK-Release: ./Tools/Scripts/run-gtk-tests --display-server=xvfb --release WebKitBuild/GTK/Release/bin/TestWebKitAPI/WebKit2Gtk/TestWebsiteData -p /webkit/WebKitWebsiteData/configuration It was kinda flaky before on the bots, but after r275267 it is failing consistently, both on the bots and locally. Checking the test, the fetch instruction at line 200 returns a WebKitWebsiteData structure with type WEBKIT_WEBSITE_DATA_DOM_CACHE set. Maybe it is not being cleared correctly? 1747167 1 lmoura 2021-04-05 16:50:12 -0700 At least two other tests are flaky timing out more frequently since the same revision in the EWS bots: /WebKit2Gtk/TestBackForwardList:/webkit/BackForwardList/navigation /WebKit2Gtk/TestWebsiteData:/webkit/WebKitWebsiteData/itp 1792837 2 438007 lmoura 2021-09-12 20:18:42 -0700 Created attachment 438007 Patch 1792864 3 438007 cgarcia 2021-09-12 23:14:25 -0700 Comment on attachment 438007 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438007&action=review > Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp:807 > + // Make sure the cache was opened before asking for it > + { > + unsigned triesCount = 4; > + bool createdCache = false; > + while (!createdCache && triesCount--) { > + auto domCacheResult = test->runJavaScriptAndWaitUntilFinished("domCacheOpened", nullptr); > + auto jsResult = webkit_javascript_result_get_js_value(domCacheResult); > + g_assert_true(jsc_value_is_boolean(jsResult)); > + if (jsc_value_to_boolean(jsResult)) > + createdCache = true; > + else > + test->wait(0.25); > + } I guess we could move this duplicated code to WebsiteDataTest class. > Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:256 > +void WebViewTest::waitUntilFileExists(const char *filename, double intervalInSeconds, unsigned tries) Why are intervalInSeconds and tries parameters if we never pass them explicitly? or did I miss any call? > Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:260 > + g_assert_true(g_file_test(filename, G_FILE_TEST_EXISTS)); I'm not sure about asserting here in a method called wait until. I would either leave the infinite loop and test will timeout if file is never created, or keep the tries but assert in the callers. Or keep the asser here, but rename the method as something like assertFileIsCreated() 1794325 4 438007 lmoura 2021-09-16 20:57:29 -0700 Comment on attachment 438007 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438007&action=review >> Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp:807 >> + } > > I guess we could move this duplicated code to WebsiteDataTest class. Ok >> Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:256 >> +void WebViewTest::waitUntilFileExists(const char *filename, double intervalInSeconds, unsigned tries) > > Why are intervalInSeconds and tries parameters if we never pass them explicitly? or did I miss any call? I added them while testing different timeouts, and left them already in case we need it. I'll remove it. >> Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:260 >> + g_assert_true(g_file_test(filename, G_FILE_TEST_EXISTS)); > > I'm not sure about asserting here in a method called wait until. I would either leave the infinite loop and test will timeout if file is never created, or keep the tries but assert in the callers. Or keep the asser here, but rename the method as something like assertFileIsCreated() IIRC, the issue was that the message while timing out was not that useful. I'll change the name of the function to better indicate its intent. Thanks for the suggestion. 1794329 5 438439 lmoura 2021-09-16 21:01:04 -0700 Created attachment 438439 Patch 1794389 6 ews-feeder 2021-09-17 04:03:00 -0700 Committed r282654 (241799@main): <https://commits.webkit.org/241799@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438439. 438007 2021-09-12 20:18:42 -0700 2021-09-16 21:00:59 -0700 Patch bug-224175-20210913001841.patch text/plain 12768 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjNlMTAyMWUyYjliMDQ4NzExZjk2ODJiYjg4YTA0MDQ1 MmQ1YjNlZC4uYzI2NDk4Y2IzMDE0YTdhNzY4ZjkxNjcwMmEyYTYyMzZhZDliYjRlNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDIxLTA5LTEwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFJFR1JFU1NJT04ocjI3NTI2NykgW0dMSUJdIEFQSSB0ZXN0IC93ZWJraXQvV2ViS2l0V2Vi c2l0ZURhdGEvY29uZmlndXJhdGlvbiBpcyBmYWlsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIFdlYnNpdGVEYXRhIHRlc3RzIHJlbHkgb24g Y2hlY2tpbmcgd2hldGhlciBzb21lIHNwZWNpZmljIGZpbGVzCisgICAgICAgIGFyZSBjcmVhdGVk IGluIHRoZSBiYWNrZ3JvdW5kLiBDdXJyZW50bHksIHRoaXMgaXMgZG9uZSB0aHJvdWdoCisgICAg ICAgIHdhaXRVbnRpbEZpbGVDaGFuZ2VkKCksIHdoaWNoIGZpcnN0IGdfZmlsZV9xdWVyeSgpIHdo ZXRoZXIgdGhlIGZpbGUKKyAgICAgICAgZXhpc3RzIGJlZm9yZSBlbnRlcmluZyBhIG1haW4gbG9v cCB3aGljaCB1c2VzIEdGaWxlTW9uaXRvci4gV2hpbGUgdGhpcworICAgICAgICB3b3JrZWQgbW9z dCBvZiB0aGUgdGltZSwgc29tZSB0ZXN0cyB3ZXJlIGZsYWt5IGR1ZSB0byBsaWtlbHkgdGhlIGZp bGUKKyAgICAgICAgYmVpbmcgY3JlYXRlZCBiZXR3ZWVuIHRoZSBxdWVyeSBjYWxsIGFuZCB0aGUg bW9uaXRvcmluZyBzdGFydGluZywKKyAgICAgICAgZXNwZWNpYWxseSBhZnRlciByZXZpc2lvbnMg bGlrZSByMjc1MjY3LgorCisgICAgICAgIFRoaXMgY29tbWl0IHJlcGxhY2VzIHRoZSB3YWl0VW50 aWxGaWxlQ2hhbmdlZCBjYWxscyB3aXRoIGFuIGV4cGxpY2l0CisgICAgICAgIGNoZWNrIGxvb3As IGxpa2Ugd2FzIGRvbmUgZm9yIHRoZSBhcHBsaWNhdGlvbkNhY2hlIGZpbGUgaW4gdGhlCisgICAg ICAgIGNvbmZpZ3VyYXRpb24gdGVzdC4KKworICAgICAgICBBbHNvLCBmb3IgdGhlIElUUCB0ZXN0 LCB0aGVyZSdzIG5vIG5lZWQgdG8gY2hlY2sgZm9yIHRoZSBmaWxlIHRvIGJlCisgICAgICAgIGRl bGV0ZWQsIGFzIHRoZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIGp1c3QgY2xlYXJzIHRoZSBkYXRh YmFzZSBhbmQKKyAgICAgICAgcmVjcmVhdGVzIHRoZSBzY2hlbWEsIHJldXNpbmcgdGhlIGV4aXN0 aW5nIGZpbGUuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2Vic2l0ZURhdGEuY3BwOgor ICAgICAgICAodGVzdFdlYnNpdGVEYXRhQ29uZmlndXJhdGlvbik6CisgICAgICAgICh0ZXN0V2Vi c2l0ZURhdGFET01DYWNoZSk6CisgICAgICAgICh0ZXN0V2Vic2l0ZURhdGFJVFApOgorICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb246CisgICAgICAgICog VGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuY3BwOgorICAgICAgICAo V2ViVmlld1Rlc3Q6OndhaXRVbnRpbEZpbGVFeGlzdHMpOgorICAgICAgICAqIFRlc3RXZWJLaXRB UEkvZ2xpYi9XZWJLaXRHTGliL1dlYlZpZXdUZXN0Lmg6CisKIDIwMjEtMDktMTAgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGFuIGxsZGIgc3Vt bWFyeSBwcm92aWRlciBmb3IgdGhlIFdlYkNvcmU6Okxlbmd0aCB0eXBlCmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYnNpdGVEYXRhLmNwcCBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2Vic2l0ZURhdGEuY3Bw CmluZGV4IDk5ODc3NmJmODlmOWE4YjljYzY3ODBkYTQzZGI5ZmRmYmViY2UzZmEuLjQzODlkOGZk NTAwY2RmN2IyMWRjOWI3ZDEzNmVhNjI3MDcxZDRjM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2Vic2l0ZURhdGEuY3BwCisrKyBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2Vic2l0ZURhdGEuY3BwCkBAIC0x NzQsNyArMTc0LDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYnNpdGVEYXRhQ29uZmlndXJhdGlvbihX ZWJzaXRlRGF0YVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgdGVzdC0+d2FpdFVudGls TG9hZEZpbmlzaGVkKCk7CiAgICAgdGVzdC0+cnVuSmF2YVNjcmlwdEFuZFdhaXRVbnRpbEZpbmlz aGVkKCJ3aW5kb3cuaW5kZXhlZERCLm9wZW4oJ1Rlc3REYXRhYmFzZScpOyIsIG51bGxwdHIpOwog ICAgIEdVbmlxdWVQdHI8Y2hhcj4gaW5kZXhlZERCRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUo VGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAiaW5kZXhlZGRiIiwgbnVsbHB0cikpOwotICAgIHRlc3Qt PndhaXRVbnRpbEZpbGVDaGFuZ2VkKGluZGV4ZWREQkRpcmVjdG9yeS5nZXQoKSwgR19GSUxFX01P TklUT1JfRVZFTlRfQ1JFQVRFRCk7CisgICAgdGVzdC0+d2FpdFVudGlsRmlsZUV4aXN0cyhpbmRl eGVkREJEaXJlY3RvcnkuZ2V0KCkpOwogICAgIGdfYXNzZXJ0X2NtcHN0cihpbmRleGVkREJEaXJl Y3RvcnkuZ2V0KCksID09LCB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0X2luZGV4ZWRk Yl9kaXJlY3RvcnkodGVzdC0+bV9tYW5hZ2VyKSk7CiAgICAgZ19hc3NlcnRfdHJ1ZShnX2ZpbGVf dGVzdChpbmRleGVkREJEaXJlY3RvcnkuZ2V0KCksIEdfRklMRV9URVNUX0lTX0RJUikpOwogCkBA IC0xODMsMTAgKzE4Myw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJzaXRlRGF0YUNvbmZpZ3VyYXRp b24oV2Vic2l0ZURhdGFUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIEdVbmlxdWVQdHI8 Y2hhcj4gYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeShnX2J1aWxkX2ZpbGVuYW1lKFRlc3Q6OmRh dGFEaXJlY3RvcnkoKSwgImFwcGNhY2hlIiwgbnVsbHB0cikpOwogICAgIGdfYXNzZXJ0X2NtcHN0 cihhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LmdldCgpLCA9PSwgd2Via2l0X3dlYnNpdGVfZGF0 YV9tYW5hZ2VyX2dldF9vZmZsaW5lX2FwcGxpY2F0aW9uX2NhY2hlX2RpcmVjdG9yeSh0ZXN0LT5t X21hbmFnZXIpKTsKICAgICBHVW5pcXVlUHRyPGNoYXI+IGFwcGxpY2F0aW9uQ2FjaGVEYXRhYmFz ZShnX2J1aWxkX2ZpbGVuYW1lKGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkuZ2V0KCksICJBcHBs aWNhdGlvbkNhY2hlLmRiIiwgbnVsbHB0cikpOwotICAgIHVuc2lnbmVkIHRyaWVzQ291bnQgPSA0 OwotICAgIHdoaWxlICghZ19maWxlX3Rlc3QoYXBwbGljYXRpb25DYWNoZURhdGFiYXNlLmdldCgp LCBHX0ZJTEVfVEVTVF9JU19SRUdVTEFSKSAmJiAtLXRyaWVzQ291bnQpCi0gICAgICAgIHRlc3Qt PndhaXQoMC4yNSk7Ci0gICAgZ19hc3NlcnRfY21wdWludCh0cmllc0NvdW50LCA+LCAwKTsKKyAg ICB0ZXN0LT53YWl0VW50aWxGaWxlRXhpc3RzKGFwcGxpY2F0aW9uQ2FjaGVEYXRhYmFzZS5nZXQo KSk7CiAKICAgICBHVW5pcXVlUHRyPGNoYXI+IGRpc2tDYWNoZURpcmVjdG9yeShnX2J1aWxkX2Zp bGVuYW1lKFRlc3Q6OmRhdGFEaXJlY3RvcnkoKSwgImRpc2stY2FjaGUiLCBudWxscHRyKSk7CiAg ICAgZ19hc3NlcnRfY21wc3RyKGRpc2tDYWNoZURpcmVjdG9yeS5nZXQoKSwgPT0sIHdlYmtpdF93 ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfZGlza19jYWNoZV9kaXJlY3RvcnkodGVzdC0+bV9tYW5h Z2VyKSk7CkBAIC0yMDEsMTYgKzE5OCwzMiBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Vic2l0ZURhdGFD b25maWd1cmF0aW9uKFdlYnNpdGVEYXRhVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIAogICAg IHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZCgibmF2aWdhdG9yLnNlcnZp Y2VXb3JrZXIucmVnaXN0ZXIoJy4vc29tZS1kdW1teS5qcycpOyIsIG51bGxwdHIpOwogICAgIEdV bmlxdWVQdHI8Y2hhcj4gc3dSZWdpc3RyYXRpb25zRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUo VGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAic2VydmljZXdvcmtlcnMiLCBudWxscHRyKSk7Ci0gICAg dGVzdC0+d2FpdFVudGlsRmlsZUNoYW5nZWQoc3dSZWdpc3RyYXRpb25zRGlyZWN0b3J5LmdldCgp LCBHX0ZJTEVfTU9OSVRPUl9FVkVOVF9DUkVBVEVEKTsKKyAgICB0ZXN0LT53YWl0VW50aWxGaWxl RXhpc3RzKHN3UmVnaXN0cmF0aW9uc0RpcmVjdG9yeS5nZXQoKSk7CiAgICAgZ19hc3NlcnRfY21w c3RyKHN3UmVnaXN0cmF0aW9uc0RpcmVjdG9yeS5nZXQoKSwgPT0sIHdlYmtpdF93ZWJzaXRlX2Rh dGFfbWFuYWdlcl9nZXRfc2VydmljZV93b3JrZXJfcmVnaXN0cmF0aW9uc19kaXJlY3RvcnkodGVz dC0+bV9tYW5hZ2VyKSk7CiAgICAgZ19hc3NlcnRfdHJ1ZShnX2ZpbGVfdGVzdChzd1JlZ2lzdHJh dGlvbnNEaXJlY3RvcnkuZ2V0KCksIEdfRklMRV9URVNUX0lTX0RJUikpOwogCi0gICAgdGVzdC0+ cnVuSmF2YVNjcmlwdEFuZFdhaXRVbnRpbEZpbmlzaGVkKCJjYWNoZXMub3BlbignbXktY2FjaGUn KTsiLCBudWxscHRyKTsKKyAgICB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNo ZWQoImxldCBkb21DYWNoZU9wZW5lZCA9IGZhbHNlOyBjYWNoZXMub3BlbignbXktY2FjaGUnKS50 aGVuKCgpID0+IHsgZG9tQ2FjaGVPcGVuZWQgPSB0cnVlfSk7IiwgbnVsbHB0cik7CiAgICAgR1Vu aXF1ZVB0cjxjaGFyPiBkb21DYWNoZURpcmVjdG9yeShnX2J1aWxkX2ZpbGVuYW1lKFRlc3Q6OmRh dGFEaXJlY3RvcnkoKSwgImRvbS1jYWNoZSIsIG51bGxwdHIpKTsKLSAgICB0ZXN0LT53YWl0VW50 aWxGaWxlQ2hhbmdlZChkb21DYWNoZURpcmVjdG9yeS5nZXQoKSwgR19GSUxFX01PTklUT1JfRVZF TlRfQ1JFQVRFRCk7CisgICAgdGVzdC0+d2FpdFVudGlsRmlsZUV4aXN0cyhkb21DYWNoZURpcmVj dG9yeS5nZXQoKSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKGRvbUNhY2hlRGlyZWN0b3J5LmdldCgp LCA9PSwgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9kb21fY2FjaGVfZGlyZWN0b3J5 KHRlc3QtPm1fbWFuYWdlcikpOwogICAgIGdfYXNzZXJ0X3RydWUoZ19maWxlX3Rlc3QoZG9tQ2Fj aGVEaXJlY3RvcnkuZ2V0KCksIEdfRklMRV9URVNUX0lTX0RJUikpOwogCisgICAgLy8gTWFrZSBz dXJlIHRoZSBjYWNoZSB3YXMgb3BlbmVkIGJlZm9yZSBhc2tpbmcgdG8gY2xlYXIgaXQgdG8gYXZv aWQgaXQgYmVpbmcgcmUtY3JlYXRlZCBiZWhpbmQgb3VyIGJhY2tzLgorICAgIHsKKyAgICAgICAg dW5zaWduZWQgdHJpZXNDb3VudCA9IDQ7CisgICAgICAgIGJvb2wgY3JlYXRlZENhY2hlID0gZmFs c2U7CisgICAgICAgIHdoaWxlICghY3JlYXRlZENhY2hlICYmIHRyaWVzQ291bnQtLSkgeworICAg ICAgICAgICAgYXV0byBkb21DYWNoZVJlc3VsdCA9IHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0 VW50aWxGaW5pc2hlZCgiZG9tQ2FjaGVPcGVuZWQiLCBudWxscHRyKTsKKyAgICAgICAgICAgIGF1 dG8ganNSZXN1bHQgPSB3ZWJraXRfamF2YXNjcmlwdF9yZXN1bHRfZ2V0X2pzX3ZhbHVlKGRvbUNh Y2hlUmVzdWx0KTsKKyAgICAgICAgICAgIGdfYXNzZXJ0X3RydWUoanNjX3ZhbHVlX2lzX2Jvb2xl YW4oanNSZXN1bHQpKTsKKyAgICAgICAgICAgIGlmIChqc2NfdmFsdWVfdG9fYm9vbGVhbihqc1Jl c3VsdCkpCisgICAgICAgICAgICAgICAgY3JlYXRlZENhY2hlID0gdHJ1ZTsKKyAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICB0ZXN0LT53YWl0KDAuMjUpOworICAgICAgICB9CisgICAg ICAgIGdfYXNzZXJ0X3RydWUoY3JlYXRlZENhY2hlKTsKKyAgICB9CisKICAgICAvLyBDbGVhciBh bGwgcGVyc2lzdGVudCBjYWNoZXMsIHNpbmNlIHRoZSBkYXRhIGRpciBpcyBjb21tb24gdG8gYWxs IHRlc3QgY2FzZXMuIE5vdGU6IG5vdCBjbGVhbmluZyB0aGUgSFNUUyBjYWNoZSBoZXJlIGFzIGl0 cyBkYXRhCiAgICAgLy8gaXMgbmVlZGVkIGZvciB0aGUgSFNUUyB0ZXN0cywgd2hlcmUgZGF0YSBj bGVhbmluZyB3aWxsIGJlIHRlc3RlZC4KICAgICBzdGF0aWMgY29uc3QgV2ViS2l0V2Vic2l0ZURh dGFUeXBlcyBwZXJzaXN0ZW50Q2FjaGVzID0gc3RhdGljX2Nhc3Q8V2ViS2l0V2Vic2l0ZURhdGFU eXBlcz4oV0VCS0lUX1dFQlNJVEVfREFUQV9ESVNLX0NBQ0hFIHwgV0VCS0lUX1dFQlNJVEVfREFU QV9MT0NBTF9TVE9SQUdFCkBAIC03MDgsOCArNzIxLDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYnNp dGVEYXRhSVRQKFdlYnNpdGVEYXRhVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIAogICAgIHRl c3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL2VtcHR5IikuZGF0YSgpKTsKICAg ICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKLQotICAgIHRlc3QtPndhaXRVbnRpbEZp bGVDaGFuZ2VkKGl0cERhdGFiYXNlRmlsZS5nZXQoKSwgR19GSUxFX01PTklUT1JfRVZFTlRfQ1JF QVRFRCk7CisgICAgdGVzdC0+d2FpdFVudGlsRmlsZUV4aXN0cyhpdHBEYXRhYmFzZUZpbGUuZ2V0 KCkpOwogICAgIGdfYXNzZXJ0X3RydWUoZ19maWxlX3Rlc3QoaXRwRGlyZWN0b3J5LCBHX0ZJTEVf VEVTVF9JU19ESVIpKTsKICAgICBnX2Fzc2VydF90cnVlKGdfZmlsZV90ZXN0KGl0cERhdGFiYXNl RmlsZS5nZXQoKSwgR19GSUxFX1RFU1RfSVNfUkVHVUxBUikpOwogCkBAIC03MzQsNyArNzQ2LDYg QEAgc3RhdGljIHZvaWQgdGVzdFdlYnNpdGVEYXRhSVRQKFdlYnNpdGVEYXRhVGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKICAgICAvLyBDbGVhciBhbGwuCiAgICAgc3RhdGljIGNvbnN0IFdlYktp dFdlYnNpdGVEYXRhVHlwZXMgY2FjaGVBbmRJVFAgPSBzdGF0aWNfY2FzdDxXZWJLaXRXZWJzaXRl RGF0YVR5cGVzPihXRUJLSVRfV0VCU0lURV9EQVRBX0lUUCB8IFdFQktJVF9XRUJTSVRFX0RBVEFf TUVNT1JZX0NBQ0hFIHwgV0VCS0lUX1dFQlNJVEVfREFUQV9ESVNLX0NBQ0hFKTsKICAgICB0ZXN0 LT5jbGVhcihjYWNoZUFuZElUUCwgMCk7Ci0gICAgdGVzdC0+d2FpdFVudGlsRmlsZUNoYW5nZWQo aXRwRGF0YWJhc2VGaWxlLmdldCgpLCBHX0ZJTEVfTU9OSVRPUl9FVkVOVF9ERUxFVEVEKTsKIAog ICAgIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9zZXRfaXRwX2VuYWJsZWQodGVzdC0+bV9t YW5hZ2VyLCBGQUxTRSk7CiAgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0X3dlYnNpdGVfZGF0YV9t YW5hZ2VyX2dldF9pdHBfZW5hYmxlZCh0ZXN0LT5tX21hbmFnZXIpKTsKQEAgLTc3OSw3ICs3OTAs MjMgQEAgc3RhdGljIHZvaWQgdGVzdFdlYnNpdGVEYXRhRE9NQ2FjaGUoV2Vic2l0ZURhdGFUZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogCiAgICAgdGVzdC0+bG9hZFVSSShrU2VydmVyLT5nZXRV UklGb3JQYXRoKCIvIikuZGF0YSgpKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQo KTsKLSAgICB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoImFzeW5jIGZ1 bmN0aW9uIG9wZW5ET01DYWNoZSgpIHsgYXdhaXQgd2luZG93LmNhY2hlcy5vcGVuKCdUZXN0RE9N Q2FjaGUnKTsgfSBvcGVuRE9NQ2FjaGUoKTsiLCBudWxscHRyKTsKKyAgICB0ZXN0LT5ydW5KYXZh U2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoImxldCBkb21DYWNoZU9wZW5lZCA9IGZhbHNlOyB3 aW5kb3cuY2FjaGVzLm9wZW4oJ1Rlc3RET01DYWNoZScpLnRoZW4oKCkgPT4geyBkb21DYWNoZU9w ZW5lZCA9IHRydWV9KTsiLCBudWxscHRyKTsKKworICAgIC8vIE1ha2Ugc3VyZSB0aGUgY2FjaGUg d2FzIG9wZW5lZCBiZWZvcmUgYXNraW5nIGZvciBpdAorICAgIHsKKyAgICAgICAgdW5zaWduZWQg dHJpZXNDb3VudCA9IDQ7CisgICAgICAgIGJvb2wgY3JlYXRlZENhY2hlID0gZmFsc2U7CisgICAg ICAgIHdoaWxlICghY3JlYXRlZENhY2hlICYmIHRyaWVzQ291bnQtLSkgeworICAgICAgICAgICAg YXV0byBkb21DYWNoZVJlc3VsdCA9IHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5p c2hlZCgiZG9tQ2FjaGVPcGVuZWQiLCBudWxscHRyKTsKKyAgICAgICAgICAgIGF1dG8ganNSZXN1 bHQgPSB3ZWJraXRfamF2YXNjcmlwdF9yZXN1bHRfZ2V0X2pzX3ZhbHVlKGRvbUNhY2hlUmVzdWx0 KTsKKyAgICAgICAgICAgIGdfYXNzZXJ0X3RydWUoanNjX3ZhbHVlX2lzX2Jvb2xlYW4oanNSZXN1 bHQpKTsKKyAgICAgICAgICAgIGlmIChqc2NfdmFsdWVfdG9fYm9vbGVhbihqc1Jlc3VsdCkpCisg ICAgICAgICAgICAgICAgY3JlYXRlZENhY2hlID0gdHJ1ZTsKKyAgICAgICAgICAgIGVsc2UKKyAg ICAgICAgICAgICAgICB0ZXN0LT53YWl0KDAuMjUpOworICAgICAgICB9CisgICAgICAgIGdfYXNz ZXJ0X3RydWUoY3JlYXRlZENhY2hlKTsKKyAgICB9CiAKICAgICBkYXRhTGlzdCA9IHRlc3QtPmZl dGNoKFdFQktJVF9XRUJTSVRFX0RBVEFfRE9NX0NBQ0hFKTsKICAgICBnX2Fzc2VydF9ub25udWxs KGRhdGFMaXN0KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhw ZWN0YXRpb25zLmpzb24gYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvVGVzdEV4cGVjdGF0aW9u cy5qc29uCmluZGV4IGU3NzU3M2RkODlhZGE1MDgyZTI2NTFhMzY3OGYxNDgwNWY0MzAwOTIuLjNl ODgyYmYxN2Q5YzUyNWZiNzlmZmI4ZGI5OWZmZjkyOTI1ZDI3YzYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb24KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9nbGliL1Rlc3RFeHBlY3RhdGlvbnMuanNvbgpAQCAtMTA2LDIzICsxMDYsNiBA QAogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICIvd2Via2l0L1dlYktpdFdlYnNpdGVEYXRh L3N0b3JhZ2UiOiB7CiAgICAgICAgICAgICAgICAgImV4cGVjdGVkIjogeyAid3BlIjogeyJzdGF0 dXMiOiBbIlBBU1MiLCAiRkFJTCJdfX0KLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiL3dl YmtpdC9XZWJLaXRXZWJzaXRlRGF0YS9kb20tY2FjaGUiOiB7Ci0gICAgICAgICAgICAgICAgImV4 cGVjdGVkIjogewotICAgICAgICAgICAgICAgICAgICAiZ3RrIjogeyJzdGF0dXMiOiBbIlBBU1Mi LCAiRkFJTCJdLCAiYnVnIjogIndlYmtpdC5vcmcvYi8yMTM3ODUifSwKLSAgICAgICAgICAgICAg ICAgICAgIndwZSI6IHsic3RhdHVzIjogWyJQQVNTIiwgIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQu b3JnL2IvMjEzNzg1In0KLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9LAotICAgICAg ICAgICAgIi93ZWJraXQvV2ViS2l0V2Vic2l0ZURhdGEvaXRwIjogewotICAgICAgICAgICAgICAg ICJleHBlY3RlZCI6IHsKLSAgICAgICAgICAgICAgICAgICAgImFsbF9iZWZvcmVfYnVnXzIyOTgw NyI6IHsic3RhdHVzIjogWyJQQVNTIiwgIlRJTUVPVVQiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2Iv MjI0MTc1In0sCi0gICAgICAgICAgICAgICAgICAgICJhbGwiOiB7InN0YXR1cyI6IFsiRkFJTCJd LCAiYnVnIjogIndlYmtpdC5vcmcvYi8yMjk4MDcifQotICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIH0sCi0gICAgICAgICAgICAiL3dlYmtpdC9XZWJLaXRXZWJzaXRlRGF0YS9jb25maWd1 cmF0aW9uIjogewotICAgICAgICAgICAgICAgICJleHBlY3RlZCI6IHsKLSAgICAgICAgICAgICAg ICAgICAgImFsbCI6IHsic3RhdHVzIjogWyJGQUlMIl0sICJidWciOiAid2Via2l0Lm9yZy9iLzIy NDE3NSJ9Ci0gICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAg fSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYlZp ZXdUZXN0LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYlZpZXdU ZXN0LmNwcAppbmRleCA0NzNiZWRjYWZlMzQyOWE2NTk5NDE3OTdmYmExZGYxNmUyNmNlZGRlLi4z ZjBmMmNmYTExODZkMmE5OTRhNDg5YzlhNGVjZTY4NDJjY2JiMGFjIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJWaWV3VGVzdC5jcHAKKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuY3BwCkBAIC0yNTMs MjIgKzI1MywxMSBAQCB2b2lkIFdlYlZpZXdUZXN0OjpzZXRFZGl0YWJsZShib29sIGVkaXRhYmxl KQogICAgIHdlYmtpdF93ZWJfdmlld19zZXRfZWRpdGFibGUobV93ZWJWaWV3LCBlZGl0YWJsZSk7 CiB9CiAKLXN0YXRpYyB2b2lkIGRpcmVjdG9yeUNoYW5nZWRDYWxsYmFjayhHRmlsZU1vbml0b3Iq LCBHRmlsZSogZmlsZSwgR0ZpbGUqLCBHRmlsZU1vbml0b3JFdmVudCBldmVudCwgV2ViVmlld1Rl c3QqIHRlc3QpCit2b2lkIFdlYlZpZXdUZXN0Ojp3YWl0VW50aWxGaWxlRXhpc3RzKGNvbnN0IGNo YXIgKmZpbGVuYW1lLCBkb3VibGUgaW50ZXJ2YWxJblNlY29uZHMsIHVuc2lnbmVkIHRyaWVzKQog ewotICAgIGlmIChldmVudCA9PSB0ZXN0LT5tX2V4cGVjdGVkRmlsZUNoYW5nZUV2ZW50ICYmIGdf ZmlsZV9lcXVhbChmaWxlLCB0ZXN0LT5tX21vbml0b3JlZEZpbGUuZ2V0KCkpKQotICAgICAgICB0 ZXN0LT5xdWl0TWFpbkxvb3AoKTsKLX0KLQotdm9pZCBXZWJWaWV3VGVzdDo6d2FpdFVudGlsRmls ZUNoYW5nZWQoY29uc3QgY2hhciogZmlsZW5hbWUsIEdGaWxlTW9uaXRvckV2ZW50IGV2ZW50KQot ewotICAgIG1fbW9uaXRvcmVkRmlsZSA9IGFkb3B0R1JlZihnX2ZpbGVfbmV3X2Zvcl9wYXRoKGZp bGVuYW1lKSk7Ci0gICAgbV9leHBlY3RlZEZpbGVDaGFuZ2VFdmVudCA9IGV2ZW50OwotICAgIEdS ZWZQdHI8R0ZpbGU+IGRpcmVjdG9yeSA9IGFkb3B0R1JlZihnX2ZpbGVfZ2V0X3BhcmVudChtX21v bml0b3JlZEZpbGUuZ2V0KCkpKTsKLSAgICBHUmVmUHRyPEdGaWxlTW9uaXRvcj4gbW9uaXRvciA9 IGFkb3B0R1JlZihnX2ZpbGVfbW9uaXRvcl9kaXJlY3RvcnkoZGlyZWN0b3J5LmdldCgpLCBHX0ZJ TEVfTU9OSVRPUl9OT05FLCBudWxscHRyLCBudWxscHRyKSk7Ci0gICAgZ19hc3NlcnQobW9uaXRv ci5nZXQoKSk7Ci0gICAgZ19zaWduYWxfY29ubmVjdChtb25pdG9yLmdldCgpLCAiY2hhbmdlZCIs IEdfQ0FMTEJBQ0soZGlyZWN0b3J5Q2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7Ci0gICAgaWYgKCFn X2ZpbGVfcXVlcnlfZXhpc3RzKG1fbW9uaXRvcmVkRmlsZS5nZXQoKSwgbnVsbHB0cikpCi0gICAg ICAgIGdfbWFpbl9sb29wX3J1bihtX21haW5Mb29wKTsKKyAgICB3aGlsZSAoIWdfZmlsZV90ZXN0 KGZpbGVuYW1lLCBHX0ZJTEVfVEVTVF9FWElTVFMpICYmIC0tdHJpZXMpCisgICAgICAgIHdhaXQo aW50ZXJ2YWxJblNlY29uZHMpOworICAgIGdfYXNzZXJ0X3RydWUoZ19maWxlX3Rlc3QoZmlsZW5h bWUsIEdfRklMRV9URVNUX0VYSVNUUykpOwogfQogCiBzdGF0aWMgdm9pZCByZXNvdXJjZUdldERh dGFDYWxsYmFjayhHT2JqZWN0KiBvYmplY3QsIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRl ciB1c2VyRGF0YSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRH TGliL1dlYlZpZXdUZXN0LmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9X ZWJWaWV3VGVzdC5oCmluZGV4IDViZmU3ODNkMjI5NTU1OWIxMjc0MzM4YmZkNTE2Yzg5ZDRhZGUy M2IuLmM0NGI5MTBkMDhhNDUwZWUwYzQ1OWFjMDU0OTE5NGMyZGE4ZGIxZjEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYlZpZXdUZXN0LmgKKysrIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuaApAQCAtNTIs NyArNTIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB3YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKICAg ICB2b2lkIHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGNvbnN0IGNoYXIqIGV4cGVjdGVkVGl0bGUp OwogICAgIHZvaWQgd2FpdFVudGlsVGl0bGVDaGFuZ2VkKCk7Ci0gICAgdm9pZCB3YWl0VW50aWxG aWxlQ2hhbmdlZChjb25zdCBjaGFyKiwgR0ZpbGVNb25pdG9yRXZlbnQpOworICAgIHZvaWQgd2Fp dFVudGlsRmlsZUV4aXN0cyhjb25zdCBjaGFyKiwgZG91YmxlIGludGVydmFsSW5TZWNvbmRzID0g MC4yNSwgdW5zaWduZWQgdHJpZXMgPSA0KTsKICAgICB2b2lkIHdhaXRVbnRpbElzV2ViUHJvY2Vz c1Jlc3BvbnNpdmVDaGFuZ2VkKCk7CiAgICAgdm9pZCByZXNpemVWaWV3KGludCB3aWR0aCwgaW50 IGhlaWdodCk7CiAgICAgdm9pZCBoaWRlVmlldygpOwpAQCAtMTA5LDggKzEwOSw2IEBAIHB1Ymxp YzoKICAgICBzaXplX3QgbV9yZXNvdXJjZURhdGFTaXplIHsgMCB9OwogICAgIGNhaXJvX3N1cmZh Y2VfdCogbV9zdXJmYWNlIHsgbnVsbHB0ciB9OwogICAgIGJvb2wgbV9leHBlY3RlZFdlYlByb2Nl c3NDcmFzaCB7IGZhbHNlIH07Ci0gICAgR1JlZlB0cjxHRmlsZT4gbV9tb25pdG9yZWRGaWxlOwot ICAgIEdGaWxlTW9uaXRvckV2ZW50IG1fZXhwZWN0ZWRGaWxlQ2hhbmdlRXZlbnQ7CiAKICNpZiBQ TEFURk9STShHVEspCiAgICAgR3RrV2lkZ2V0KiBtX3BhcmVudFdpbmRvdyB7IG51bGxwdHIgfTsK 438439 2021-09-16 21:01:04 -0700 2021-09-17 04:03:01 -0700 Patch bug-224175-20210917010102.patch text/plain 12426 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNTQ1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjE0MTQyNGQzNzZmY2YzOGY5ZTY2YTA2ZTQ1YjQ4MDM0 OWMyMmVkMi4uNjU1MzAwMzhkYTlhZmM0N2EzMzIyZjk1YzEyNWE5ZGEzOTQzMzkwNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDIxLTA5LTE2ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFJFR1JFU1NJT04ocjI3NTI2NykgW0dMSUJdIEFQSSB0ZXN0IC93ZWJraXQvV2ViS2l0V2Vi c2l0ZURhdGEvY29uZmlndXJhdGlvbiBpcyBmYWlsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBD YXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAgICBTb21lIFdlYnNpdGVEYXRhIHRlc3RzIHJl bHkgb24gY2hlY2tpbmcgd2hldGhlciBzb21lIHNwZWNpZmljIGZpbGVzCisgICAgICAgIGFyZSBj cmVhdGVkIGluIHRoZSBiYWNrZ3JvdW5kLiBDdXJyZW50bHksIHRoaXMgaXMgZG9uZSB0aHJvdWdo CisgICAgICAgIHdhaXRVbnRpbEZpbGVDaGFuZ2VkKCksIHdoaWNoIGZpcnN0IGdfZmlsZV9xdWVy eSgpIHdoZXRoZXIgdGhlIGZpbGUKKyAgICAgICAgZXhpc3RzIGJlZm9yZSBlbnRlcmluZyBhIG1h aW4gbG9vcCB3aGljaCB1c2VzIEdGaWxlTW9uaXRvci4gV2hpbGUgdGhpcworICAgICAgICB3b3Jr ZWQgbW9zdCBvZiB0aGUgdGltZSwgc29tZSB0ZXN0cyB3ZXJlIGZsYWt5IGR1ZSB0byBsaWtlbHkg dGhlIGZpbGUKKyAgICAgICAgYmVpbmcgY3JlYXRlZCBiZXR3ZWVuIHRoZSBxdWVyeSBjYWxsIGFu ZCB0aGUgbW9uaXRvcmluZyBzdGFydGluZywKKyAgICAgICAgZXNwZWNpYWxseSBhZnRlciByZXZp c2lvbnMgbGlrZSByMjc1MjY3LgorCisgICAgICAgIFRoaXMgY29tbWl0IHJlcGxhY2VzIHRoZSB3 YWl0VW50aWxGaWxlQ2hhbmdlZCBjYWxscyB3aXRoIGFuIGV4cGxpY2l0CisgICAgICAgIGNoZWNr IGxvb3AsIGxpa2Ugd2FzIGRvbmUgZm9yIHRoZSBhcHBsaWNhdGlvbkNhY2hlIGZpbGUgaW4gdGhl CisgICAgICAgIGNvbmZpZ3VyYXRpb24gdGVzdC4KKworICAgICAgICBBbHNvLCBmb3IgdGhlIElU UCB0ZXN0LCB0aGVyZSdzIG5vIG5lZWQgdG8gY2hlY2sgZm9yIHRoZSBmaWxlIHRvIGJlCisgICAg ICAgIGRlbGV0ZWQsIGFzIHRoZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIGp1c3QgY2xlYXJzIHRo ZSBkYXRhYmFzZSBhbmQKKyAgICAgICAgcmVjcmVhdGVzIHRoZSBzY2hlbWEsIHJldXNpbmcgdGhl IGV4aXN0aW5nIGZpbGUuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2Vic2l0ZURhdGEu Y3BwOgorICAgICAgICAodGVzdFdlYnNpdGVEYXRhQ29uZmlndXJhdGlvbik6CisgICAgICAgICh0 ZXN0V2Vic2l0ZURhdGFJVFApOgorICAgICAgICAodGVzdFdlYnNpdGVEYXRhRE9NQ2FjaGUpOgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb246CisgICAg ICAgICogVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuY3BwOgorICAg ICAgICAoV2ViVmlld1Rlc3Q6OmFzc2VydEZpbGVJc0NyZWF0ZWQpOgorICAgICAgICAoV2ViVmll d1Rlc3Q6OmFzc2VydEphdmFTY3JpcHRCZWNvbWVzVHJ1ZSk6CisgICAgICAgICogVGVzdFdlYktp dEFQSS9nbGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuaDoKKwogMjAyMS0wOS0xNiAgVHlsZXIg V2lsY29jayA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+IGFuZCBNeWxlcyBDLiBNYXhmaWVsZCAg PG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgZm9udC13ZWlnaHQgc2hvdWxkIGFsd2F5 cyBzZXJpYWxpemUgYXMgYSBudW1iZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0R0xpYi9UZXN0V2Vic2l0ZURhdGEuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJzaXRlRGF0YS5jcHAKaW5kZXggOTk4Nzc2YmY4OWY5 YThiOWNjNjc4MGRhNDNkYjlmZGZiZWJjZTNmYS4uODIxMDMwMTEwYmNmZjgyYmFmZjU1MTBkZTc3 YTZlNTg4Y2ExMGQ4YyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRHTGliL1Rlc3RXZWJzaXRlRGF0YS5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRHTGliL1Rlc3RXZWJzaXRlRGF0YS5jcHAKQEAgLTE3NCw3ICsxNzQsNyBAQCBzdGF0 aWMgdm9pZCB0ZXN0V2Vic2l0ZURhdGFDb25maWd1cmF0aW9uKFdlYnNpdGVEYXRhVGVzdCogdGVz dCwgZ2NvbnN0cG9pbnRlcikKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKICAg ICB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoIndpbmRvdy5pbmRleGVk REIub3BlbignVGVzdERhdGFiYXNlJyk7IiwgbnVsbHB0cik7CiAgICAgR1VuaXF1ZVB0cjxjaGFy PiBpbmRleGVkREJEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShUZXN0OjpkYXRhRGlyZWN0b3J5 KCksICJpbmRleGVkZGIiLCBudWxscHRyKSk7Ci0gICAgdGVzdC0+d2FpdFVudGlsRmlsZUNoYW5n ZWQoaW5kZXhlZERCRGlyZWN0b3J5LmdldCgpLCBHX0ZJTEVfTU9OSVRPUl9FVkVOVF9DUkVBVEVE KTsKKyAgICB0ZXN0LT5hc3NlcnRGaWxlSXNDcmVhdGVkKGluZGV4ZWREQkRpcmVjdG9yeS5nZXQo KSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKGluZGV4ZWREQkRpcmVjdG9yeS5nZXQoKSwgPT0sIHdl YmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfaW5kZXhlZGRiX2RpcmVjdG9yeSh0ZXN0LT5t X21hbmFnZXIpKTsKICAgICBnX2Fzc2VydF90cnVlKGdfZmlsZV90ZXN0KGluZGV4ZWREQkRpcmVj dG9yeS5nZXQoKSwgR19GSUxFX1RFU1RfSVNfRElSKSk7CiAKQEAgLTE4MywxMCArMTgzLDcgQEAg c3RhdGljIHZvaWQgdGVzdFdlYnNpdGVEYXRhQ29uZmlndXJhdGlvbihXZWJzaXRlRGF0YVRlc3Qq IHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgR1VuaXF1ZVB0cjxjaGFyPiBhcHBsaWNhdGlvbkNh Y2hlRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUoVGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAiYXBw Y2FjaGUiLCBudWxscHRyKSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKGFwcGxpY2F0aW9uQ2FjaGVE aXJlY3RvcnkuZ2V0KCksID09LCB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0X29mZmxp bmVfYXBwbGljYXRpb25fY2FjaGVfZGlyZWN0b3J5KHRlc3QtPm1fbWFuYWdlcikpOwogICAgIEdV bmlxdWVQdHI8Y2hhcj4gYXBwbGljYXRpb25DYWNoZURhdGFiYXNlKGdfYnVpbGRfZmlsZW5hbWUo YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeS5nZXQoKSwgIkFwcGxpY2F0aW9uQ2FjaGUuZGIiLCBu dWxscHRyKSk7Ci0gICAgdW5zaWduZWQgdHJpZXNDb3VudCA9IDQ7Ci0gICAgd2hpbGUgKCFnX2Zp bGVfdGVzdChhcHBsaWNhdGlvbkNhY2hlRGF0YWJhc2UuZ2V0KCksIEdfRklMRV9URVNUX0lTX1JF R1VMQVIpICYmIC0tdHJpZXNDb3VudCkKLSAgICAgICAgdGVzdC0+d2FpdCgwLjI1KTsKLSAgICBn X2Fzc2VydF9jbXB1aW50KHRyaWVzQ291bnQsID4sIDApOworICAgIHRlc3QtPmFzc2VydEZpbGVJ c0NyZWF0ZWQoYXBwbGljYXRpb25DYWNoZURhdGFiYXNlLmdldCgpKTsKIAogICAgIEdVbmlxdWVQ dHI8Y2hhcj4gZGlza0NhY2hlRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUoVGVzdDo6ZGF0YURp cmVjdG9yeSgpLCAiZGlzay1jYWNoZSIsIG51bGxwdHIpKTsKICAgICBnX2Fzc2VydF9jbXBzdHIo ZGlza0NhY2hlRGlyZWN0b3J5LmdldCgpLCA9PSwgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2Vy X2dldF9kaXNrX2NhY2hlX2RpcmVjdG9yeSh0ZXN0LT5tX21hbmFnZXIpKTsKQEAgLTIwMSwxNiAr MTk4LDE5IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJzaXRlRGF0YUNvbmZpZ3VyYXRpb24oV2Vic2l0 ZURhdGFUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogCiAgICAgdGVzdC0+cnVuSmF2YVNjcmlw dEFuZFdhaXRVbnRpbEZpbmlzaGVkKCJuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5yZWdpc3Rlcign Li9zb21lLWR1bW15LmpzJyk7IiwgbnVsbHB0cik7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiBzd1Jl Z2lzdHJhdGlvbnNEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShUZXN0OjpkYXRhRGlyZWN0b3J5 KCksICJzZXJ2aWNld29ya2VycyIsIG51bGxwdHIpKTsKLSAgICB0ZXN0LT53YWl0VW50aWxGaWxl Q2hhbmdlZChzd1JlZ2lzdHJhdGlvbnNEaXJlY3RvcnkuZ2V0KCksIEdfRklMRV9NT05JVE9SX0VW RU5UX0NSRUFURUQpOworICAgIHRlc3QtPmFzc2VydEZpbGVJc0NyZWF0ZWQoc3dSZWdpc3RyYXRp b25zRGlyZWN0b3J5LmdldCgpKTsKICAgICBnX2Fzc2VydF9jbXBzdHIoc3dSZWdpc3RyYXRpb25z RGlyZWN0b3J5LmdldCgpLCA9PSwgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9zZXJ2 aWNlX3dvcmtlcl9yZWdpc3RyYXRpb25zX2RpcmVjdG9yeSh0ZXN0LT5tX21hbmFnZXIpKTsKICAg ICBnX2Fzc2VydF90cnVlKGdfZmlsZV90ZXN0KHN3UmVnaXN0cmF0aW9uc0RpcmVjdG9yeS5nZXQo KSwgR19GSUxFX1RFU1RfSVNfRElSKSk7CiAKLSAgICB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2Fp dFVudGlsRmluaXNoZWQoImNhY2hlcy5vcGVuKCdteS1jYWNoZScpOyIsIG51bGxwdHIpOworICAg IHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZCgibGV0IGRvbUNhY2hlT3Bl bmVkID0gZmFsc2U7IGNhY2hlcy5vcGVuKCdteS1jYWNoZScpLnRoZW4oKCkgPT4geyBkb21DYWNo ZU9wZW5lZCA9IHRydWV9KTsiLCBudWxscHRyKTsKICAgICBHVW5pcXVlUHRyPGNoYXI+IGRvbUNh Y2hlRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUoVGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAiZG9t LWNhY2hlIiwgbnVsbHB0cikpOwotICAgIHRlc3QtPndhaXRVbnRpbEZpbGVDaGFuZ2VkKGRvbUNh Y2hlRGlyZWN0b3J5LmdldCgpLCBHX0ZJTEVfTU9OSVRPUl9FVkVOVF9DUkVBVEVEKTsKKyAgICB0 ZXN0LT5hc3NlcnRGaWxlSXNDcmVhdGVkKGRvbUNhY2hlRGlyZWN0b3J5LmdldCgpKTsKICAgICBn X2Fzc2VydF9jbXBzdHIoZG9tQ2FjaGVEaXJlY3RvcnkuZ2V0KCksID09LCB3ZWJraXRfd2Vic2l0 ZV9kYXRhX21hbmFnZXJfZ2V0X2RvbV9jYWNoZV9kaXJlY3RvcnkodGVzdC0+bV9tYW5hZ2VyKSk7 CiAgICAgZ19hc3NlcnRfdHJ1ZShnX2ZpbGVfdGVzdChkb21DYWNoZURpcmVjdG9yeS5nZXQoKSwg R19GSUxFX1RFU1RfSVNfRElSKSk7CiAKKyAgICAvLyBNYWtlIHN1cmUgdGhlIGNhY2hlIHdhcyBv cGVuZWQgYmVmb3JlIGFza2luZyB0byBjbGVhciBpdCB0byBhdm9pZCBpdCBiZWluZyByZS1jcmVh dGVkIGJlaGluZCBvdXIgYmFja3MuCisgICAgdGVzdC0+YXNzZXJ0SmF2YVNjcmlwdEJlY29tZXNU cnVlKCJkb21DYWNoZU9wZW5lZCIpOworCiAgICAgLy8gQ2xlYXIgYWxsIHBlcnNpc3RlbnQgY2Fj aGVzLCBzaW5jZSB0aGUgZGF0YSBkaXIgaXMgY29tbW9uIHRvIGFsbCB0ZXN0IGNhc2VzLiBOb3Rl OiBub3QgY2xlYW5pbmcgdGhlIEhTVFMgY2FjaGUgaGVyZSBhcyBpdHMgZGF0YQogICAgIC8vIGlz IG5lZWRlZCBmb3IgdGhlIEhTVFMgdGVzdHMsIHdoZXJlIGRhdGEgY2xlYW5pbmcgd2lsbCBiZSB0 ZXN0ZWQuCiAgICAgc3RhdGljIGNvbnN0IFdlYktpdFdlYnNpdGVEYXRhVHlwZXMgcGVyc2lzdGVu dENhY2hlcyA9IHN0YXRpY19jYXN0PFdlYktpdFdlYnNpdGVEYXRhVHlwZXM+KFdFQktJVF9XRUJT SVRFX0RBVEFfRElTS19DQUNIRSB8IFdFQktJVF9XRUJTSVRFX0RBVEFfTE9DQUxfU1RPUkFHRQpA QCAtNzA4LDggKzcwOCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJzaXRlRGF0YUlUUChXZWJzaXRl RGF0YVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAKICAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2 ZXItPmdldFVSSUZvclBhdGgoIi9lbXB0eSIpLmRhdGEoKSk7CiAgICAgdGVzdC0+d2FpdFVudGls TG9hZEZpbmlzaGVkKCk7Ci0KLSAgICB0ZXN0LT53YWl0VW50aWxGaWxlQ2hhbmdlZChpdHBEYXRh YmFzZUZpbGUuZ2V0KCksIEdfRklMRV9NT05JVE9SX0VWRU5UX0NSRUFURUQpOworICAgIHRlc3Qt PmFzc2VydEZpbGVJc0NyZWF0ZWQoaXRwRGF0YWJhc2VGaWxlLmdldCgpKTsKICAgICBnX2Fzc2Vy dF90cnVlKGdfZmlsZV90ZXN0KGl0cERpcmVjdG9yeSwgR19GSUxFX1RFU1RfSVNfRElSKSk7CiAg ICAgZ19hc3NlcnRfdHJ1ZShnX2ZpbGVfdGVzdChpdHBEYXRhYmFzZUZpbGUuZ2V0KCksIEdfRklM RV9URVNUX0lTX1JFR1VMQVIpKTsKIApAQCAtNzM0LDcgKzczMyw2IEBAIHN0YXRpYyB2b2lkIHRl c3RXZWJzaXRlRGF0YUlUUChXZWJzaXRlRGF0YVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAg ICAgLy8gQ2xlYXIgYWxsLgogICAgIHN0YXRpYyBjb25zdCBXZWJLaXRXZWJzaXRlRGF0YVR5cGVz IGNhY2hlQW5kSVRQID0gc3RhdGljX2Nhc3Q8V2ViS2l0V2Vic2l0ZURhdGFUeXBlcz4oV0VCS0lU X1dFQlNJVEVfREFUQV9JVFAgfCBXRUJLSVRfV0VCU0lURV9EQVRBX01FTU9SWV9DQUNIRSB8IFdF QktJVF9XRUJTSVRFX0RBVEFfRElTS19DQUNIRSk7CiAgICAgdGVzdC0+Y2xlYXIoY2FjaGVBbmRJ VFAsIDApOwotICAgIHRlc3QtPndhaXRVbnRpbEZpbGVDaGFuZ2VkKGl0cERhdGFiYXNlRmlsZS5n ZXQoKSwgR19GSUxFX01PTklUT1JfRVZFTlRfREVMRVRFRCk7CiAKICAgICB3ZWJraXRfd2Vic2l0 ZV9kYXRhX21hbmFnZXJfc2V0X2l0cF9lbmFibGVkKHRlc3QtPm1fbWFuYWdlciwgRkFMU0UpOwog ICAgIGdfYXNzZXJ0X2ZhbHNlKHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfaXRwX2Vu YWJsZWQodGVzdC0+bV9tYW5hZ2VyKSk7CkBAIC03NzksNyArNzc3LDEwIEBAIHN0YXRpYyB2b2lk IHRlc3RXZWJzaXRlRGF0YURPTUNhY2hlKFdlYnNpdGVEYXRhVGVzdCogdGVzdCwgZ2NvbnN0cG9p bnRlcikKIAogICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiLyIpLmRh dGEoKSk7CiAgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7Ci0gICAgdGVzdC0+cnVu SmF2YVNjcmlwdEFuZFdhaXRVbnRpbEZpbmlzaGVkKCJhc3luYyBmdW5jdGlvbiBvcGVuRE9NQ2Fj aGUoKSB7IGF3YWl0IHdpbmRvdy5jYWNoZXMub3BlbignVGVzdERPTUNhY2hlJyk7IH0gb3BlbkRP TUNhY2hlKCk7IiwgbnVsbHB0cik7CisgICAgdGVzdC0+cnVuSmF2YVNjcmlwdEFuZFdhaXRVbnRp bEZpbmlzaGVkKCJsZXQgZG9tQ2FjaGVPcGVuZWQgPSBmYWxzZTsgd2luZG93LmNhY2hlcy5vcGVu KCdUZXN0RE9NQ2FjaGUnKS50aGVuKCgpID0+IHsgZG9tQ2FjaGVPcGVuZWQgPSB0cnVlfSk7Iiwg bnVsbHB0cik7CisKKyAgICAvLyBNYWtlIHN1cmUgdGhlIGNhY2hlIHdhcyBvcGVuZWQgYmVmb3Jl IGFza2luZyBmb3IgaXQKKyAgICB0ZXN0LT5hc3NlcnRKYXZhU2NyaXB0QmVjb21lc1RydWUoImRv bUNhY2hlT3BlbmVkIik7CiAKICAgICBkYXRhTGlzdCA9IHRlc3QtPmZldGNoKFdFQktJVF9XRUJT SVRFX0RBVEFfRE9NX0NBQ0hFKTsKICAgICBnX2Fzc2VydF9ub25udWxsKGRhdGFMaXN0KTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb24g Yi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvVGVzdEV4cGVjdGF0aW9ucy5qc29uCmluZGV4IGU3 NzU3M2RkODlhZGE1MDgyZTI2NTFhMzY3OGYxNDgwNWY0MzAwOTIuLjNlODgyYmYxN2Q5YzUyNWZi NzlmZmI4ZGI5OWZmZjkyOTI1ZDI3YzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv Z2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb24KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGli L1Rlc3RFeHBlY3RhdGlvbnMuanNvbgpAQCAtMTA2LDIzICsxMDYsNiBAQAogICAgICAgICAgICAg fSwKICAgICAgICAgICAgICIvd2Via2l0L1dlYktpdFdlYnNpdGVEYXRhL3N0b3JhZ2UiOiB7CiAg ICAgICAgICAgICAgICAgImV4cGVjdGVkIjogeyAid3BlIjogeyJzdGF0dXMiOiBbIlBBU1MiLCAi RkFJTCJdfX0KLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiL3dlYmtpdC9XZWJLaXRXZWJz aXRlRGF0YS9kb20tY2FjaGUiOiB7Ci0gICAgICAgICAgICAgICAgImV4cGVjdGVkIjogewotICAg ICAgICAgICAgICAgICAgICAiZ3RrIjogeyJzdGF0dXMiOiBbIlBBU1MiLCAiRkFJTCJdLCAiYnVn IjogIndlYmtpdC5vcmcvYi8yMTM3ODUifSwKLSAgICAgICAgICAgICAgICAgICAgIndwZSI6IHsi c3RhdHVzIjogWyJQQVNTIiwgIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMjEzNzg1In0K LSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9LAotICAgICAgICAgICAgIi93ZWJraXQv V2ViS2l0V2Vic2l0ZURhdGEvaXRwIjogewotICAgICAgICAgICAgICAgICJleHBlY3RlZCI6IHsK LSAgICAgICAgICAgICAgICAgICAgImFsbF9iZWZvcmVfYnVnXzIyOTgwNyI6IHsic3RhdHVzIjog WyJQQVNTIiwgIlRJTUVPVVQiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMjI0MTc1In0sCi0gICAg ICAgICAgICAgICAgICAgICJhbGwiOiB7InN0YXR1cyI6IFsiRkFJTCJdLCAiYnVnIjogIndlYmtp dC5vcmcvYi8yMjk4MDcifQotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0sCi0gICAg ICAgICAgICAiL3dlYmtpdC9XZWJLaXRXZWJzaXRlRGF0YS9jb25maWd1cmF0aW9uIjogewotICAg ICAgICAgICAgICAgICJleHBlY3RlZCI6IHsKLSAgICAgICAgICAgICAgICAgICAgImFsbCI6IHsi c3RhdHVzIjogWyJGQUlMIl0sICJidWciOiAid2Via2l0Lm9yZy9iLzIyNDE3NSJ9Ci0gICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSwKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYlZpZXdUZXN0LmNwcCBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYlZpZXdUZXN0LmNwcAppbmRleCA0 NzNiZWRjYWZlMzQyOWE2NTk5NDE3OTdmYmExZGYxNmUyNmNlZGRlLi5hNTQ2OTc5ZWJiNGNiOTcw MTEwMTFjMmZjMjc0OWYzNjEzZjllNWJkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L2dsaWIvV2ViS2l0R0xpYi9XZWJWaWV3VGVzdC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9nbGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuY3BwCkBAIC0yNTMsMjIgKzI1MywzMCBAQCB2 b2lkIFdlYlZpZXdUZXN0OjpzZXRFZGl0YWJsZShib29sIGVkaXRhYmxlKQogICAgIHdlYmtpdF93 ZWJfdmlld19zZXRfZWRpdGFibGUobV93ZWJWaWV3LCBlZGl0YWJsZSk7CiB9CiAKLXN0YXRpYyB2 b2lkIGRpcmVjdG9yeUNoYW5nZWRDYWxsYmFjayhHRmlsZU1vbml0b3IqLCBHRmlsZSogZmlsZSwg R0ZpbGUqLCBHRmlsZU1vbml0b3JFdmVudCBldmVudCwgV2ViVmlld1Rlc3QqIHRlc3QpCit2b2lk IFdlYlZpZXdUZXN0Ojphc3NlcnRGaWxlSXNDcmVhdGVkKGNvbnN0IGNoYXIgKmZpbGVuYW1lKQog ewotICAgIGlmIChldmVudCA9PSB0ZXN0LT5tX2V4cGVjdGVkRmlsZUNoYW5nZUV2ZW50ICYmIGdf ZmlsZV9lcXVhbChmaWxlLCB0ZXN0LT5tX21vbml0b3JlZEZpbGUuZ2V0KCkpKQotICAgICAgICB0 ZXN0LT5xdWl0TWFpbkxvb3AoKTsKKyAgICBjb25zdGV4cHIgZG91YmxlIGludGVydmFsSW5TZWNv bmRzID0gMC4yNTsKKyAgICB1bnNpZ25lZCB0cmllcyA9IDQ7CisgICAgd2hpbGUgKCFnX2ZpbGVf dGVzdChmaWxlbmFtZSwgR19GSUxFX1RFU1RfRVhJU1RTKSAmJiAtLXRyaWVzKQorICAgICAgICB3 YWl0KGludGVydmFsSW5TZWNvbmRzKTsKKyAgICBnX2Fzc2VydF90cnVlKGdfZmlsZV90ZXN0KGZp bGVuYW1lLCBHX0ZJTEVfVEVTVF9FWElTVFMpKTsKIH0KIAotdm9pZCBXZWJWaWV3VGVzdDo6d2Fp dFVudGlsRmlsZUNoYW5nZWQoY29uc3QgY2hhciogZmlsZW5hbWUsIEdGaWxlTW9uaXRvckV2ZW50 IGV2ZW50KQordm9pZCBXZWJWaWV3VGVzdDo6YXNzZXJ0SmF2YVNjcmlwdEJlY29tZXNUcnVlKGNv bnN0IGNoYXIqIGphdmFzY3JpcHQpCiB7Ci0gICAgbV9tb25pdG9yZWRGaWxlID0gYWRvcHRHUmVm KGdfZmlsZV9uZXdfZm9yX3BhdGgoZmlsZW5hbWUpKTsKLSAgICBtX2V4cGVjdGVkRmlsZUNoYW5n ZUV2ZW50ID0gZXZlbnQ7Ci0gICAgR1JlZlB0cjxHRmlsZT4gZGlyZWN0b3J5ID0gYWRvcHRHUmVm KGdfZmlsZV9nZXRfcGFyZW50KG1fbW9uaXRvcmVkRmlsZS5nZXQoKSkpOwotICAgIEdSZWZQdHI8 R0ZpbGVNb25pdG9yPiBtb25pdG9yID0gYWRvcHRHUmVmKGdfZmlsZV9tb25pdG9yX2RpcmVjdG9y eShkaXJlY3RvcnkuZ2V0KCksIEdfRklMRV9NT05JVE9SX05PTkUsIG51bGxwdHIsIG51bGxwdHIp KTsKLSAgICBnX2Fzc2VydChtb25pdG9yLmdldCgpKTsKLSAgICBnX3NpZ25hbF9jb25uZWN0KG1v bml0b3IuZ2V0KCksICJjaGFuZ2VkIiwgR19DQUxMQkFDSyhkaXJlY3RvcnlDaGFuZ2VkQ2FsbGJh Y2spLCB0aGlzKTsKLSAgICBpZiAoIWdfZmlsZV9xdWVyeV9leGlzdHMobV9tb25pdG9yZWRGaWxl LmdldCgpLCBudWxscHRyKSkKLSAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOwor ICAgIHVuc2lnbmVkIHRyaWVzQ291bnQgPSA0OworICAgIGJvb2wgYmVjYW1lVHJ1ZSA9IGZhbHNl OworICAgIHdoaWxlICghYmVjYW1lVHJ1ZSAmJiB0cmllc0NvdW50LS0pIHsKKyAgICAgICAgYXV0 byBqc1Jlc3VsdCA9IHJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZChqYXZhc2NyaXB0 LCBudWxscHRyKTsKKyAgICAgICAgYXV0byBqc1ZhbHVlID0gd2Via2l0X2phdmFzY3JpcHRfcmVz dWx0X2dldF9qc192YWx1ZShqc1Jlc3VsdCk7CisgICAgICAgIGlmIChqc2NfdmFsdWVfaXNfYm9v bGVhbihqc1ZhbHVlKSAmJiBqc2NfdmFsdWVfdG9fYm9vbGVhbihqc1ZhbHVlKSkgeworICAgICAg ICAgICAgYmVjYW1lVHJ1ZSA9IHRydWU7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQor CisgICAgICAgIHdhaXQoMC4yNSk7CisgICAgfQorICAgIGdfYXNzZXJ0X3RydWUoYmVjYW1lVHJ1 ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIHJlc291cmNlR2V0RGF0YUNhbGxiYWNrKEdPYmplY3QqIG9i amVjdCwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGdwb2ludGVyIHVzZXJEYXRhKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuaCBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYlZpZXdUZXN0LmgKaW5kZXggNWJm ZTc4M2QyMjk1NTU5YjEyNzQzMzhiZmQ1MTZjODlkNGFkZTIzYi4uYTI4YTVlZGM4ZDQwZjU4YjUw NWFiNjRiMWVmNDhhYTBiNjU5NzMzMyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9n bGliL1dlYktpdEdMaWIvV2ViVmlld1Rlc3QuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2ds aWIvV2ViS2l0R0xpYi9XZWJWaWV3VGVzdC5oCkBAIC01Miw4ICs1Miw5IEBAIHB1YmxpYzoKICAg ICB2b2lkIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogICAgIHZvaWQgd2FpdFVudGlsVGl0bGVD aGFuZ2VkVG8oY29uc3QgY2hhciogZXhwZWN0ZWRUaXRsZSk7CiAgICAgdm9pZCB3YWl0VW50aWxU aXRsZUNoYW5nZWQoKTsKLSAgICB2b2lkIHdhaXRVbnRpbEZpbGVDaGFuZ2VkKGNvbnN0IGNoYXIq LCBHRmlsZU1vbml0b3JFdmVudCk7CiAgICAgdm9pZCB3YWl0VW50aWxJc1dlYlByb2Nlc3NSZXNw b25zaXZlQ2hhbmdlZCgpOworICAgIHZvaWQgYXNzZXJ0RmlsZUlzQ3JlYXRlZChjb25zdCBjaGFy Kik7CisgICAgdm9pZCBhc3NlcnRKYXZhU2NyaXB0QmVjb21lc1RydWUoY29uc3QgY2hhciopOwog ICAgIHZvaWQgcmVzaXplVmlldyhpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogICAgIHZvaWQgaGlk ZVZpZXcoKTsKICAgICB2b2lkIHNlbGVjdEFsbCgpOwpAQCAtMTA5LDggKzExMCw2IEBAIHB1Ymxp YzoKICAgICBzaXplX3QgbV9yZXNvdXJjZURhdGFTaXplIHsgMCB9OwogICAgIGNhaXJvX3N1cmZh Y2VfdCogbV9zdXJmYWNlIHsgbnVsbHB0ciB9OwogICAgIGJvb2wgbV9leHBlY3RlZFdlYlByb2Nl c3NDcmFzaCB7IGZhbHNlIH07Ci0gICAgR1JlZlB0cjxHRmlsZT4gbV9tb25pdG9yZWRGaWxlOwot ICAgIEdGaWxlTW9uaXRvckV2ZW50IG1fZXhwZWN0ZWRGaWxlQ2hhbmdlRXZlbnQ7CiAKICNpZiBQ TEFURk9STShHVEspCiAgICAgR3RrV2lkZ2V0KiBtX3BhcmVudFdpbmRvdyB7IG51bGxwdHIgfTsK