223140 2021-03-12 14:10:16 -0800 REGRESSION(r274270): [WPE][GTK] Broke Epiphany test /embed/ephy-web-view/error-pages-not-stored-in-history 2021-03-13 06:34:30 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222943 P2 Normal --- 1 mcatanzaro mcatanzaro achristensen berto bugs-noreply cgarcia darin ews-watchlist gustavo mcatanzaro oldest_to_newest 1739024 0 mcatanzaro 2021-03-12 14:10:16 -0800 After changing WebKitSecurityOrigin from WebCore::SecurityOrigin to WebCore::SecurityOriginData, this Epiphany test now crashes: (gdb) bt full #0 __strchr_avx2 () at ../sysdeps/x86_64/multiarch/strchr-avx2.S:57 No locals. #1 0x00007fc62915d2fe in ephy_permissions_manager_get_settings_for_origin (manager=0x12c4440, origin=0x1b38440 "://") at ../dist-unpack/epiphany-3.38.3/lib/ephy-permissions-manager.c:127 origin_path = 0x7fc5b8292fe8 "://" trimmed_protocol = 0x0 settings = 0x0 security_origin = 0x7fc61b97b360 pos = 0x4 <error: Cannot access memory at address 0x4> __func__ = "ephy_permissions_manager_get_settings_for_origin" #2 0x00007fc62915d504 in ephy_permissions_manager_get_permission (manager=0x12c4440, type=EPHY_PERMISSION_TYPE_SHOW_ADS, origin=0x1b38440 "://") at ../dist-unpack/epiphany-3.38.3/lib/ephy-permissions-manager.c:186 settings = 0x14021a0 __func__ = "ephy_permissions_manager_get_permission" #3 0x00007fc62923e5c9 in update_ucm_ads_state (web_view=0x1b22830, uri=0x7fc61b93e340 "http://localhost:2984375930/") at ../dist-unpack/epiphany-3.38.3/embed/ephy-web-view.c:1484 ucm = 0x1acb110 permission = EPHY_PERMISSION_UNDECIDED enable = 0 origin = 0x1b38440 "://" shell = 0x1402350 #4 0x00007fc62923e819 in load_changed_cb (web_view=0x1b22830, load_event=WEBKIT_LOAD_COMMITTED, user_data=0x0) at ../dist-unpack/epiphany-3.38.3/embed/ephy-web-view.c:1545 uri = 0x7fc61b93e340 "http://localhost:2984375930/" view = 0x1b22830 object = 0x1b22830 Problem is we wind up passing a bogus origin "://" to EphyPermissionsManager, which isn't prepared for that. The problem is webkit_security_origin_to_string(), which would have previously returned NULL in this case. It's easy to fix. Alex, I've CCed you on this because I made one change to WebCore::SecurityOriginData: diff --git a/Source/WebCore/page/SecurityOriginData.cpp b/Source/WebCore/page/SecurityOriginData.cpp index 430cb8b0b3ac..7286fd6379fc 100644 --- a/Source/WebCore/page/SecurityOriginData.cpp +++ b/Source/WebCore/page/SecurityOriginData.cpp @@ -41,6 +41,9 @@ String SecurityOriginData::toString() const if (protocol == "file") return "file://"_s; + if (protocol.isEmpty()) + return { }; + if (!port) return makeString(protocol, "://", host); return makeString(protocol, "://", host, ':', static_cast<uint32_t>(*port)); which I think is fine because a security origin with no protocol is pretty meaningless. Do you agree that change is correct? I could do it in WebKitSecurityOrigin itself if you prefer. 1739026 1 mcatanzaro 2021-03-12 14:15:30 -0800 Actually, to be very conservative, I'll change it to return empty string only if both protocol and host are empty, OK? 1739030 2 423081 mcatanzaro 2021-03-12 14:20:40 -0800 Created attachment 423081 Patch 1739031 3 ews-watchlist 2021-03-12 14:21:31 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1739038 4 423081 mcatanzaro 2021-03-12 15:08:54 -0800 Comment on attachment 423081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423081&action=review > Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSecurityOrigin.cpp:136 > +static void testBogusPort(Test*, gconstpointer) > +{ > + // Garbage in, garbage out... > + WebKitSecurityOrigin* origin = webkit_security_origin_new("http", "localhost", 9999); That's... not a bogus port. I'll fix that before landing. 1739047 5 423088 mcatanzaro 2021-03-12 15:29:28 -0800 Created attachment 423088 Patch for landing 1739081 6 ews-feeder 2021-03-12 17:55:31 -0800 Committed r274375: <https://commits.webkit.org/r274375> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423088. 1739082 7 423088 darin 2021-03-12 17:58:56 -0800 Comment on attachment 423088 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=423088&action=review > Source/WebCore/page/SecurityOriginData.cpp:45 > + if (protocol.isEmpty() && host.isEmpty()) > + return { }; This is a cross-platform change. It’s good we have regression tests for this for [glib]. Is there also a way we can make a cross-platform test for it? 1739100 8 achristensen 2021-03-12 20:34:53 -0800 It could probably be done using WKSecurityOriginCreate. I think this change is good cross-platform. We certainly don't want "://" to be the origin. 1739144 9 mcatanzaro 2021-03-13 06:34:30 -0800 We have a test WKSecurityOrigin.cpp already that's designed to be cross-platform, but it's not listed in any CMake file, so it's really XCode-specific unfortunately.... 423081 2021-03-12 14:20:40 -0800 2021-03-12 15:29:25 -0800 Patch bug-223140-20210312162040.patch text/plain 6723 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTFhY2VjMzE1M2UxNjY1 YTczNGVkZTIyOWUyZjdhZTljOTIwYThjMy4uMWE5NGI3MTc2MzE0OWJhYTNhYWY4ZWZjMjdkOTUy ZGEzZTA1NTM5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAzLTEyICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjI3NDI3MCk6IFtXUEVdW0dUS10gQnJva2UgRXBpcGhhbnkgdGVzdCAvZW1iZWQvZXBoeS13 ZWItdmlldy9lcnJvci1wYWdlcy1ub3Qtc3RvcmVkLWluLWhpc3RvcnkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzE0MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHRoZSBTZWN1cml0eU9yaWdpbkRh dGEgaGFzIG5vIHByb3RvY29sIG9yIGhvc3QsIHJldHVybiBhbiBlbXB0eSBzdHJpbmcgaW5zdGVh ZCBvZiAiOi8vIgorCisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhOjp0b1N0cmluZyBjb25zdCk6CisKIDIw MjEtMDMtMTIgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW3NlbGVjdG9yc10gOmZvY3VzLXZpc2libGUgbWF0Y2hlcyBib2R5IGFmdGVyIGtleWJv YXJkIGV2ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDczMDdkMWU5YjdmZGUzYTJmZWVmNzYyYTE2OTQzZWQ4ODI1 ZWZhMmIuLjY2MjI5ZTA2YTNmMmFlNWM3NDJkZDdhMTFiZjExMjkzODQ3YjQ5ODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDMtMTIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjc0MjcwKTogW1dQRV1bR1RL XSBCcm9rZSBFcGlwaGFueSB0ZXN0IC9lbWJlZC9lcGh5LXdlYi12aWV3L2Vycm9yLXBhZ2VzLW5v dC1zdG9yZWQtaW4taGlzdG9yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzMTQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ29udmVydCBlbXB0eSBzdHJpbmdzIHRvIE5VTEwuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0U2VjdXJpdHlPcmlnaW4uY3BwOgorICAgICAgICAod2Vi a2l0X3NlY3VyaXR5X29yaWdpbl90b19zdHJpbmcpOgorCiAyMDIxLTAzLTEyICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IGRlYnVnIGFz c2VydGlvbiBvbiBib3RzIGFmdGVyIHIyNzQzMjMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luRGF0YS5jcHAKaW5kZXggNDMwY2I4YjBiM2FjMzZjY2E5NjExZTBhMWYwOWUzNWFl MTBiMGQ5Yy4uNzljMDY3YjcwOTVmZTIzZmY0MDM4NzE4NTBmZjVjYjM5NmU1NzNhYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcApAQCAtNDEsNiArNDEsOSBA QCBTdHJpbmcgU2VjdXJpdHlPcmlnaW5EYXRhOjp0b1N0cmluZygpIGNvbnN0CiAgICAgaWYgKHBy b3RvY29sID09ICJmaWxlIikKICAgICAgICAgcmV0dXJuICJmaWxlOi8vIl9zOwogCisgICAgaWYg KHByb3RvY29sLmlzRW1wdHkoKSAmJiBob3N0LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIHsg fTsKKwogICAgIGlmICghcG9ydCkKICAgICAgICAgcmV0dXJuIG1ha2VTdHJpbmcocHJvdG9jb2ws ICI6Ly8iLCBob3N0KTsKICAgICByZXR1cm4gbWFrZVN0cmluZyhwcm90b2NvbCwgIjovLyIsIGhv c3QsICc6Jywgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KCpwb3J0KSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRTZWN1cml0eU9yaWdpbi5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRTZWN1cml0eU9yaWdpbi5jcHAK aW5kZXggMDhhN2E5ODUyM2VjNWMzZmZjYzhkNTBkNTQ1NzYwYmE3YWJlODFhNy4uMjVhZTkzNzQw YzBiYTlhMGE3N2E3NjliYmE5NTllNzkyNTM2ZTU4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0U2VjdXJpdHlPcmlnaW4uY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFNlY3VyaXR5T3JpZ2luLmNwcApAQCAt MjU3LDUgKzI1Nyw1IEBAIGdjaGFyKiB3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX3RvX3N0cmluZyhX ZWJLaXRTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKG9y aWdpbiwgbnVsbHB0cik7CiAKICAgICBDU3RyaW5nIGNzdHJpbmcgPSBvcmlnaW4tPnNlY3VyaXR5 T3JpZ2luRGF0YS50b1N0cmluZygpLnV0ZjgoKTsKLSAgICByZXR1cm4gY3N0cmluZyA9PSAibnVs bCIgPyBudWxscHRyIDogZ19zdHJkdXAgKGNzdHJpbmcuZGF0YSgpKTsKKyAgICByZXR1cm4gY3N0 cmluZyA9PSAibnVsbCIgfHwgY3N0cmluZyA9PSAiIiA/IG51bGxwdHIgOiBnX3N0cmR1cCAoY3N0 cmluZy5kYXRhKCkpOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDQ0MTA4NWMzZmQ5OWJkOWY2ZjM5YTc1N2RmYTUxYjVkMWQ0NjUxNDEuLmFj YzFhNjJjZjkzZmNkZTk0MWRjNDc2YmVhNjNlZmZjMzFlYWI2YmQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0w My0xMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGdub21lLm9yZz4KKworICAgICAg ICBSRUdSRVNTSU9OKHIyNzQyNzApOiBbV1BFXVtHVEtdIEJyb2tlIEVwaXBoYW55IHRlc3QgL2Vt YmVkL2VwaHktd2ViLXZpZXcvZXJyb3ItcGFnZXMtbm90LXN0b3JlZC1pbi1oaXN0b3J5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjMxNDAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIFdlYktp dFNlY3VyaXR5T3JpZ2luIHRlc3RzIGEgYml0LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRTZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgICh0 ZXN0Q3VzdG9tUHJvdG9jb2xPcmlnaW4pOiBDaGVjayB0aGUgcmVzdWx0IG9mIHdlYmtpdF9zZWN1 cml0eV9vcmlnaW5fdG9fc3RyaW5nKCkuCisgICAgICAgICh0ZXN0Qm9ndXNQb3J0KTogQWRkZWQu IE5vdCBkaXJlY3RseSByZWxhdGVkIHRvIHRoaXMgYnVnLCBidXQgbW9yZSB0ZXN0cyBhcmUgbmlj ZS4KKyAgICAgICAgKHRlc3RCb2d1c1VSSSk6IEFkZWRkLCB0ZXN0cyBmb3IgdGhpcyBidWcuCisg ICAgICAgIChiZWZvcmVBbGwpOgorCiAyMDIxLTAzLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVk YXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiB0d28gd2Via2l0c2NtcHkudGVz dC5zdm5fdW5pdHRlc3QuVGVzdFJlbW90ZVN2biB0ZXN0cyBhcmUgZmxha3kgZmFpbHVyZXMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0 U2VjdXJpdHlPcmlnaW4uY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGli L1Rlc3RXZWJLaXRTZWN1cml0eU9yaWdpbi5jcHAKaW5kZXggYjJjYjQwNDY5OTA4YTM1OWYwNmZi YTNmM2Y3MTAzYjEwZTQxY2JkOS4uMzE4ZjhiZDBmYWI0YzVkM2Y0OTZlZDFiYjAzMmFlZWIxMmVj MTNiOSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rl c3RXZWJLaXRTZWN1cml0eU9yaWdpbi5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRTZWN1cml0eU9yaWdpbi5jcHAKQEAgLTEyMiwxMiArMTIy LDM5IEBAIHN0YXRpYyB2b2lkIHRlc3RDdXN0b21Qcm90b2NvbE9yaWdpbihUZXN0KiwgZ2NvbnN0 cG9pbnRlcikKIHsKICAgICBXZWJLaXRTZWN1cml0eU9yaWdpbiogb3JpZ2luID0gd2Via2l0X3Nl Y3VyaXR5X29yaWdpbl9uZXdfZm9yX3VyaSgic3F1aXJyZWw6Ly9maXNoIik7CiAgICAgZ19hc3Nl cnRfbm9ubnVsbChvcmlnaW4pOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gYXNTdHJpbmcod2Via2l0 X3NlY3VyaXR5X29yaWdpbl90b19zdHJpbmcob3JpZ2luKSk7CisgICAgZ19hc3NlcnRfY21wc3Ry KGFzU3RyaW5nLmdldCgpLCA9PSwgInNxdWlycmVsOi8vZmlzaCIpOwogICAgIGdfYXNzZXJ0X2Nt cHN0cih3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wcm90b2NvbChvcmlnaW4pLCA9PSwgInNx dWlycmVsIik7CiAgICAgZ19hc3NlcnRfY21wc3RyKHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fZ2V0 X2hvc3Qob3JpZ2luKSwgPT0sICJmaXNoIik7CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF9z ZWN1cml0eV9vcmlnaW5fZ2V0X3BvcnQob3JpZ2luKSwgPT0sIDApOwogICAgIHdlYmtpdF9zZWN1 cml0eV9vcmlnaW5fdW5yZWYob3JpZ2luKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdEJvZ3VzUG9y dChUZXN0KiwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICAvLyBHYXJiYWdlIGluLCBnYXJiYWdlIG91 dC4uLgorICAgIFdlYktpdFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4gPSB3ZWJraXRfc2VjdXJpdHlf b3JpZ2luX25ldygiaHR0cCIsICJsb2NhbGhvc3QiLCA5OTk5KTsKKyAgICBnX2Fzc2VydF9ub25u dWxsKG9yaWdpbik7CisgICAgR1VuaXF1ZVB0cjxjaGFyPiBhc1N0cmluZyh3ZWJraXRfc2VjdXJp dHlfb3JpZ2luX3RvX3N0cmluZyhvcmlnaW4pKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIoYXNTdHJp bmcuZ2V0KCksID09LCAiaHR0cDovL2xvY2FsaG9zdDo5OTk5Iik7CisgICAgZ19hc3NlcnRfY21w c3RyKHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fZ2V0X3Byb3RvY29sKG9yaWdpbiksID09LCAiaHR0 cCIpOworICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9ob3N0 KG9yaWdpbiksID09LCAibG9jYWxob3N0Iik7CisgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF9z ZWN1cml0eV9vcmlnaW5fZ2V0X3BvcnQob3JpZ2luKSwgPT0sIDk5OTkpOworICAgIHdlYmtpdF9z ZWN1cml0eV9vcmlnaW5fdW5yZWYob3JpZ2luKTsKK30KKworc3RhdGljIHZvaWQgdGVzdEJvZ3Vz VVJJKFRlc3QqLCBnY29uc3Rwb2ludGVyKQoreworICAgIFdlYktpdFNlY3VyaXR5T3JpZ2luKiBv cmlnaW4gPSB3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX25ld19mb3JfdXJpKCJodHRwOi8vbG9jYWxo b3N0OjI5ODQzNzU5MzIiKTsKKyAgICBnX2Fzc2VydF9ub25udWxsKG9yaWdpbik7CisgICAgR1Vu aXF1ZVB0cjxjaGFyPiBhc1N0cmluZyh3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX3RvX3N0cmluZyhv cmlnaW4pKTsKKyAgICBnX2Fzc2VydF9udWxsKGFzU3RyaW5nLmdldCgpKTsKKyAgICBnX2Fzc2Vy dF9udWxsKHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fZ2V0X3Byb3RvY29sKG9yaWdpbikpOworICAg IGdfYXNzZXJ0X251bGwod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfaG9zdChvcmlnaW4pKTsK KyAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfcG9ydChvcmln aW4pLCA9PSwgMCk7CisgICAgd2Via2l0X3NlY3VyaXR5X29yaWdpbl91bnJlZihvcmlnaW4pOwor fQorCiB2b2lkIGJlZm9yZUFsbCgpCiB7CiAgICAgVGVzdDo6YWRkKCJXZWJLaXRTZWN1cml0eU9y aWdpbiIsICJiYXNpYy1jb25zdHJ1Y3RvciIsIHRlc3RTZWN1cml0eU9yaWdpbkJhc2ljQ29uc3Ry dWN0b3IpOwpAQCAtMTM2LDYgKzE2Myw4IEBAIHZvaWQgYmVmb3JlQWxsKCkKICAgICBUZXN0Ojph ZGQoIldlYktpdFNlY3VyaXR5T3JpZ2luIiwgImZpbGUtdXJpIiwgdGVzdFNlY3VyaXR5T3JpZ2lu RmlsZVVSSSk7CiAgICAgVGVzdDo6YWRkKCJXZWJLaXRTZWN1cml0eU9yaWdpbiIsICJibG9iLXVy aSIsIHRlc3RTZWN1cml0eU9yaWdpbkRhdGFVUkkpOwogICAgIFRlc3Q6OmFkZCgiV2ViS2l0U2Vj dXJpdHlPcmlnaW4iLCAiY3VzdG9tLXByb3RvY29sLW9yaWdpbiIsIHRlc3RDdXN0b21Qcm90b2Nv bE9yaWdpbik7CisgICAgVGVzdDo6YWRkKCJXZWJLaXRTZWN1cml0eU9yaWdpbiIsICJib2d1cy1w b3J0IiwgdGVzdEJvZ3VzUG9ydCk7CisgICAgVGVzdDo6YWRkKCJXZWJLaXRTZWN1cml0eU9yaWdp biIsICJib2d1cy11cmkiLCB0ZXN0Qm9ndXNVUkkpOwogfQogCiB2b2lkIGFmdGVyQWxsKCkK 423088 2021-03-12 15:29:28 -0800 2021-03-12 17:55:33 -0800 Patch for landing bug-223140-20210312172927.patch text/plain 5946 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTFhY2VjMzE1M2UxNjY1 YTczNGVkZTIyOWUyZjdhZTljOTIwYThjMy4uMzU0YTc0NGQxMDk2ZmZhNDU3NjgxZmU0NDUyMWY3 OTMyOThkMjBmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAzLTEyICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjI3NDI3MCk6IFtXUEVdW0dUS10gQnJva2UgRXBpcGhhbnkgdGVzdCAvZW1iZWQvZXBoeS13 ZWItdmlldy9lcnJvci1wYWdlcy1ub3Qtc3RvcmVkLWluLWhpc3RvcnkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzE0MAorCisgICAgICAgIFJldmll d2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgSWYgdGhlIFNlY3VyaXR5T3JpZ2lu RGF0YSBoYXMgbm8gcHJvdG9jb2wgb3IgaG9zdCwgcmV0dXJuIGFuIGVtcHR5IHN0cmluZyBpbnN0 ZWFkIG9mICI6Ly8iCisKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE6OnRvU3RyaW5nIGNvbnN0KToKKwog MjAyMS0wMy0xMiAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbc2VsZWN0b3JzXSA6Zm9jdXMtdmlzaWJsZSBtYXRjaGVzIGJvZHkgYWZ0ZXIga2V5 Ym9hcmQgZXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNzMwN2QxZTliN2ZkZTNhMmZlZWY3NjJhMTY5NDNlZDg4 MjVlZmEyYi4uNDQ3NTI5NWU0OTRhOGQyMzFhNzA1MjdlMmFmNTcwNDE0ZjNiMmZmOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wMy0xMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0 YW56YXJvQGdub21lLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNzQyNzApOiBbV1BFXVtH VEtdIEJyb2tlIEVwaXBoYW55IHRlc3QgL2VtYmVkL2VwaHktd2ViLXZpZXcvZXJyb3ItcGFnZXMt bm90LXN0b3JlZC1pbi1oaXN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjMxNDAKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVu c2VuLgorCisgICAgICAgIENvbnZlcnQgZW1wdHkgc3RyaW5ncyB0byBOVUxMLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFNlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAg KHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fdG9fc3RyaW5nKToKKwogMjAyMS0wMy0xMiAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeCBkZWJ1 ZyBhc3NlcnRpb24gb24gYm90cyBhZnRlciByMjc0MzIzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9T ZWN1cml0eU9yaWdpbkRhdGEuY3BwCmluZGV4IDQzMGNiOGIwYjNhYzM2Y2NhOTYxMWUwYTFmMDll MzVhZTEwYjBkOWMuLjc5YzA2N2I3MDk1ZmUyM2ZmNDAzODcxODUwZmY1Y2IzOTZlNTczYWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5jcHAKQEAgLTQxLDYgKzQx LDkgQEAgU3RyaW5nIFNlY3VyaXR5T3JpZ2luRGF0YTo6dG9TdHJpbmcoKSBjb25zdAogICAgIGlm IChwcm90b2NvbCA9PSAiZmlsZSIpCiAgICAgICAgIHJldHVybiAiZmlsZTovLyJfczsKIAorICAg IGlmIChwcm90b2NvbC5pc0VtcHR5KCkgJiYgaG9zdC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVy biB7IH07CisKICAgICBpZiAoIXBvcnQpCiAgICAgICAgIHJldHVybiBtYWtlU3RyaW5nKHByb3Rv Y29sLCAiOi8vIiwgaG9zdCk7CiAgICAgcmV0dXJuIG1ha2VTdHJpbmcocHJvdG9jb2wsICI6Ly8i LCBob3N0LCAnOicsIHN0YXRpY19jYXN0PHVpbnQzMl90PigqcG9ydCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0U2VjdXJpdHlPcmlnaW4uY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0U2VjdXJpdHlPcmlnaW4u Y3BwCmluZGV4IDA4YTdhOTg1MjNlYzVjM2ZmY2M4ZDUwZDU0NTc2MGJhN2FiZTgxYTcuLjI1YWU5 Mzc0MGMwYmE5YTBhNzdhNzY5YmJhOTU5ZTc5MjUzNmU1ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFNlY3VyaXR5T3JpZ2luLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRTZWN1cml0eU9yaWdpbi5jcHAK QEAgLTI1Nyw1ICsyNTcsNSBAQCBnY2hhciogd2Via2l0X3NlY3VyaXR5X29yaWdpbl90b19zdHJp bmcoV2ViS2l0U2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKICAgICBnX3JldHVybl92YWxfaWZfZmFp bChvcmlnaW4sIG51bGxwdHIpOwogCiAgICAgQ1N0cmluZyBjc3RyaW5nID0gb3JpZ2luLT5zZWN1 cml0eU9yaWdpbkRhdGEudG9TdHJpbmcoKS51dGY4KCk7Ci0gICAgcmV0dXJuIGNzdHJpbmcgPT0g Im51bGwiID8gbnVsbHB0ciA6IGdfc3RyZHVwIChjc3RyaW5nLmRhdGEoKSk7CisgICAgcmV0dXJu IGNzdHJpbmcgPT0gIm51bGwiIHx8IGNzdHJpbmcgPT0gIiIgPyBudWxscHRyIDogZ19zdHJkdXAg KGNzdHJpbmcuZGF0YSgpKTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCA0NDEwODVjM2ZkOTliZDlmNmYzOWE3NTdkZmE1MWI1ZDFkNDY1MTQx Li5kM2U1N2RiYjFiOTc0YzdjOWM1YmU1NGFkNzY1NzEyNDkxOTdjOTVkIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIw MjEtMDMtMTIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAg ICAgICAgUkVHUkVTU0lPTihyMjc0MjcwKTogW1dQRV1bR1RLXSBCcm9rZSBFcGlwaGFueSB0ZXN0 IC9lbWJlZC9lcGh5LXdlYi12aWV3L2Vycm9yLXBhZ2VzLW5vdC1zdG9yZWQtaW4taGlzdG9yeQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzMTQwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBJbXByb3Zl IFdlYktpdFNlY3VyaXR5T3JpZ2luIHRlc3RzIGEgYml0LgorCisgICAgICAgICogVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRTZWN1cml0eU9yaWdpbi5jcHA6CisgICAg ICAgICh0ZXN0Q3VzdG9tUHJvdG9jb2xPcmlnaW4pOiBEcml2ZS1ieSBpbXByb3ZlbWVudDogY2hl Y2sgd2Via2l0X3NlY3VyaXR5X29yaWdpbl90b19zdHJpbmcoKS4KKyAgICAgICAgKHRlc3RCb2d1 c1VSSSk6IEFkZGVkLCB0ZXN0cyBmb3IgdGhpcyBidWcuCisgICAgICAgIChiZWZvcmVBbGwpOgor CiAyMDIxLTAzLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OOiB0d28gd2Via2l0c2NtcHkudGVzdC5zdm5fdW5pdHRlc3QuVGVzdFJl bW90ZVN2biB0ZXN0cyBhcmUgZmxha3kgZmFpbHVyZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0U2VjdXJpdHlPcmlnaW4uY3BwIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRTZWN1cml0eU9y aWdpbi5jcHAKaW5kZXggYjJjYjQwNDY5OTA4YTM1OWYwNmZiYTNmM2Y3MTAzYjEwZTQxY2JkOS4u M2M0YWQ2N2RhOWNlMjg2YWZmNDE4MzBiMGY5NTljY2IxOWQyNWU4MyAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRTZWN1cml0eU9yaWdp bi5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJL aXRTZWN1cml0eU9yaWdpbi5jcHAKQEAgLTEyMiwxMiArMTIyLDI2IEBAIHN0YXRpYyB2b2lkIHRl c3RDdXN0b21Qcm90b2NvbE9yaWdpbihUZXN0KiwgZ2NvbnN0cG9pbnRlcikKIHsKICAgICBXZWJL aXRTZWN1cml0eU9yaWdpbiogb3JpZ2luID0gd2Via2l0X3NlY3VyaXR5X29yaWdpbl9uZXdfZm9y X3VyaSgic3F1aXJyZWw6Ly9maXNoIik7CiAgICAgZ19hc3NlcnRfbm9ubnVsbChvcmlnaW4pOwor ICAgIEdVbmlxdWVQdHI8Y2hhcj4gYXNTdHJpbmcod2Via2l0X3NlY3VyaXR5X29yaWdpbl90b19z dHJpbmcob3JpZ2luKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKGFzU3RyaW5nLmdldCgpLCA9PSwg InNxdWlycmVsOi8vZmlzaCIpOwogICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfc2VjdXJpdHlf b3JpZ2luX2dldF9wcm90b2NvbChvcmlnaW4pLCA9PSwgInNxdWlycmVsIik7CiAgICAgZ19hc3Nl cnRfY21wc3RyKHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fZ2V0X2hvc3Qob3JpZ2luKSwgPT0sICJm aXNoIik7CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fZ2V0X3Bv cnQob3JpZ2luKSwgPT0sIDApOwogICAgIHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fdW5yZWYob3Jp Z2luKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdEJvZ3VzVVJJKFRlc3QqLCBnY29uc3Rwb2ludGVy KQoreworICAgIFdlYktpdFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4gPSB3ZWJraXRfc2VjdXJpdHlf b3JpZ2luX25ld19mb3JfdXJpKCJodHRwOi8vbG9jYWxob3N0OjI5ODQzNzU5MzIiKTsKKyAgICBn X2Fzc2VydF9ub25udWxsKG9yaWdpbik7CisgICAgR1VuaXF1ZVB0cjxjaGFyPiBhc1N0cmluZyh3 ZWJraXRfc2VjdXJpdHlfb3JpZ2luX3RvX3N0cmluZyhvcmlnaW4pKTsKKyAgICBnX2Fzc2VydF9u dWxsKGFzU3RyaW5nLmdldCgpKTsKKyAgICBnX2Fzc2VydF9udWxsKHdlYmtpdF9zZWN1cml0eV9v cmlnaW5fZ2V0X3Byb3RvY29sKG9yaWdpbikpOworICAgIGdfYXNzZXJ0X251bGwod2Via2l0X3Nl Y3VyaXR5X29yaWdpbl9nZXRfaG9zdChvcmlnaW4pKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQod2Vi a2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfcG9ydChvcmlnaW4pLCA9PSwgMCk7CisgICAgd2Via2l0 X3NlY3VyaXR5X29yaWdpbl91bnJlZihvcmlnaW4pOworfQorCiB2b2lkIGJlZm9yZUFsbCgpCiB7 CiAgICAgVGVzdDo6YWRkKCJXZWJLaXRTZWN1cml0eU9yaWdpbiIsICJiYXNpYy1jb25zdHJ1Y3Rv ciIsIHRlc3RTZWN1cml0eU9yaWdpbkJhc2ljQ29uc3RydWN0b3IpOwpAQCAtMTM2LDYgKzE1MCw3 IEBAIHZvaWQgYmVmb3JlQWxsKCkKICAgICBUZXN0OjphZGQoIldlYktpdFNlY3VyaXR5T3JpZ2lu IiwgImZpbGUtdXJpIiwgdGVzdFNlY3VyaXR5T3JpZ2luRmlsZVVSSSk7CiAgICAgVGVzdDo6YWRk KCJXZWJLaXRTZWN1cml0eU9yaWdpbiIsICJibG9iLXVyaSIsIHRlc3RTZWN1cml0eU9yaWdpbkRh dGFVUkkpOwogICAgIFRlc3Q6OmFkZCgiV2ViS2l0U2VjdXJpdHlPcmlnaW4iLCAiY3VzdG9tLXBy b3RvY29sLW9yaWdpbiIsIHRlc3RDdXN0b21Qcm90b2NvbE9yaWdpbik7CisgICAgVGVzdDo6YWRk KCJXZWJLaXRTZWN1cml0eU9yaWdpbiIsICJib2d1cy11cmkiLCB0ZXN0Qm9ndXNVUkkpOwogfQog CiB2b2lkIGFmdGVyQWxsKCkK