195238 2019-03-01 19:55:49 -0800 Fix crashes when NetworkResourceLoader/NetworkLoadChecker are destroyed during HTTPS upgrade check 2019-03-04 12:55:38 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez commit-queue webkit-bug-importer oldest_to_newest 1511746 0 achristensen 2019-03-01 19:55:49 -0800 Fix crashes when NetworkResourceLoader/NetworkLoadChecker are destroyed during HTTPS upgrade check 1511747 1 363402 achristensen 2019-03-01 19:57:50 -0800 Created attachment 363402 Patch 1511755 2 363402 cdumez 2019-03-01 20:49:40 -0800 Comment on attachment 363402 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363402&action=review > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:227 > + applyHTTPSUpgradeIfNeeded(WTFMove(request), [this, weakThis = makeWeakPtr(*this), client, handler = WTFMove(handler), originalRequest = WTFMove(originalRequest)](auto request) mutable { Seems suspicious that you'd fix this here but not in the processContentExtensionRulesForLoad() lambda below... 1512263 3 achristensen 2019-03-04 11:53:13 -0800 processContentExtensionRulesForLoad's implementation currently already has this protection, but there's no reason not to make this more robust. 1512264 4 363534 achristensen 2019-03-04 11:53:26 -0800 Created attachment 363534 Patch 1512265 5 363534 cdumez 2019-03-04 11:54:35 -0800 Comment on attachment 363534 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363534&action=review > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:244 > + if (!weakThis) Personally, I would have put this below the if (!result.has_value()) check so that we may return a more accurate exception when we already have one. 1512288 6 363539 achristensen 2019-03-04 12:19:56 -0800 Created attachment 363539 Patch 1512320 7 363539 commit-queue 2019-03-04 12:54:50 -0800 Comment on attachment 363539 Patch Clearing flags on attachment: 363539 Committed r242377: <https://trac.webkit.org/changeset/242377> 1512321 8 commit-queue 2019-03-04 12:54:52 -0800 All reviewed patches have been landed. Closing bug. 1512322 9 webkit-bug-importer 2019-03-04 12:55:38 -0800 <rdar://problem/48573506> 363402 2019-03-01 19:57:50 -0800 2019-03-04 11:53:24 -0800 Patch bug-195238-20190301195749.patch text/plain 1675 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDIzMDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTAzLTAxICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGNyYXNoZXMg d2hlbiBOZXR3b3JrUmVzb3VyY2VMb2FkZXIvTmV0d29ya0xvYWRDaGVja2VyIGFyZSBkZXN0cm95 ZWQgZHVyaW5nIEhUVFBTIHVwZ3JhZGUgY2hlY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTIzOAorICAgICAgICA8PHJkYXI6Ly9wcm9ibGVtLzQ3 NTk4NjU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0xvYWRDaGVja2VyOjpjaGVja1JlcXVlc3QpOgorCiAyMDE5LTAzLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBXaW5kb3dz IGJ1aWxkIGZpeCBhZnRlciByMjQyMzAyLgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcAkocmV2aXNpb24gMjQyMzAxKQor KysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMjQsNyArMjI0LDkgQEAgdm9pZCBOZXR3b3JrTG9hZENoZWNrZXI6 OmNoZWNrUmVxdWVzdChSZQogewogICAgIFJlc291cmNlUmVxdWVzdCBvcmlnaW5hbFJlcXVlc3Qg PSByZXF1ZXN0OwogCi0gICAgYXBwbHlIVFRQU1VwZ3JhZGVJZk5lZWRlZChXVEZNb3ZlKHJlcXVl c3QpLCBbdGhpcywgY2xpZW50LCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwgb3JpZ2luYWxS ZXF1ZXN0ID0gV1RGTW92ZShvcmlnaW5hbFJlcXVlc3QpXShhdXRvIHJlcXVlc3QpIG11dGFibGUg eworICAgIGFwcGx5SFRUUFNVcGdyYWRlSWZOZWVkZWQoV1RGTW92ZShyZXF1ZXN0KSwgW3RoaXMs IHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBjbGllbnQsIGhhbmRsZXIgPSBXVEZNb3Zl KGhhbmRsZXIpLCBvcmlnaW5hbFJlcXVlc3QgPSBXVEZNb3ZlKG9yaWdpbmFsUmVxdWVzdCldKGF1 dG8gcmVxdWVzdCkgbXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAg ICByZXR1cm4gaGFuZGxlcih7IFJlc291cmNlRXJyb3IgeyBSZXNvdXJjZUVycm9yOjpUeXBlOjpD YW5jZWxsYXRpb24gfX0pOwogCiAgICAgICAgIGlmIChhdXRvKiBjb250ZW50U2VjdXJpdHlQb2xp Y3kgPSB0aGlzLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKSkgewogICAgICAgICAgICAgaWYgKHRo aXMtPmlzUmVkaXJlY3RlZCgpKSB7Cg== 363534 2019-03-04 11:53:26 -0800 2019-03-04 12:19:54 -0800 Patch bug-195238-20190304115325.patch text/plain 2422 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDIzMDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTAzLTAxICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGNyYXNoZXMg d2hlbiBOZXR3b3JrUmVzb3VyY2VMb2FkZXIvTmV0d29ya0xvYWRDaGVja2VyIGFyZSBkZXN0cm95 ZWQgZHVyaW5nIEhUVFBTIHVwZ3JhZGUgY2hlY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTIzOAorICAgICAgICA8PHJkYXI6Ly9wcm9ibGVtLzQ3 NTk4NjU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0xvYWRDaGVja2VyOjpjaGVja1JlcXVlc3QpOgorCiAyMDE5LTAzLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBXaW5kb3dz IGJ1aWxkIGZpeCBhZnRlciByMjQyMzAyLgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcAkocmV2aXNpb24gMjQyMzAxKQor KysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMjQsNyArMjI0LDkgQEAgdm9pZCBOZXR3b3JrTG9hZENoZWNrZXI6 OmNoZWNrUmVxdWVzdChSZQogewogICAgIFJlc291cmNlUmVxdWVzdCBvcmlnaW5hbFJlcXVlc3Qg PSByZXF1ZXN0OwogCi0gICAgYXBwbHlIVFRQU1VwZ3JhZGVJZk5lZWRlZChXVEZNb3ZlKHJlcXVl c3QpLCBbdGhpcywgY2xpZW50LCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwgb3JpZ2luYWxS ZXF1ZXN0ID0gV1RGTW92ZShvcmlnaW5hbFJlcXVlc3QpXShhdXRvIHJlcXVlc3QpIG11dGFibGUg eworICAgIGFwcGx5SFRUUFNVcGdyYWRlSWZOZWVkZWQoV1RGTW92ZShyZXF1ZXN0KSwgW3RoaXMs IHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBjbGllbnQsIGhhbmRsZXIgPSBXVEZNb3Zl KGhhbmRsZXIpLCBvcmlnaW5hbFJlcXVlc3QgPSBXVEZNb3ZlKG9yaWdpbmFsUmVxdWVzdCldKGF1 dG8gcmVxdWVzdCkgbXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAg ICByZXR1cm4gaGFuZGxlcih7IFJlc291cmNlRXJyb3IgeyBSZXNvdXJjZUVycm9yOjpUeXBlOjpD YW5jZWxsYXRpb24gfX0pOwogCiAgICAgICAgIGlmIChhdXRvKiBjb250ZW50U2VjdXJpdHlQb2xp Y3kgPSB0aGlzLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKSkgewogICAgICAgICAgICAgaWYgKHRo aXMtPmlzUmVkaXJlY3RlZCgpKSB7CkBAIC0yMzgsNyArMjQwLDEwIEBAIHZvaWQgTmV0d29ya0xv YWRDaGVja2VyOjpjaGVja1JlcXVlc3QoUmUKICAgICAgICAgfQogCiAjaWYgRU5BQkxFKENPTlRF TlRfRVhURU5TSU9OUykKLSAgICAgICAgdGhpcy0+cHJvY2Vzc0NvbnRlbnRFeHRlbnNpb25SdWxl c0ZvckxvYWQoV1RGTW92ZShyZXF1ZXN0KSwgW3RoaXMsIGhhbmRsZXIgPSBXVEZNb3ZlKGhhbmRs ZXIpLCBvcmlnaW5hbFJlcXVlc3QgPSBXVEZNb3ZlKG9yaWdpbmFsUmVxdWVzdCldKGF1dG8gcmVz dWx0KSBtdXRhYmxlIHsKKyAgICAgICAgdGhpcy0+cHJvY2Vzc0NvbnRlbnRFeHRlbnNpb25SdWxl c0ZvckxvYWQoV1RGTW92ZShyZXF1ZXN0KSwgW3RoaXMsIHdlYWtUaGlzID0gV1RGTW92ZSh3ZWFr VGhpcyksIGhhbmRsZXIgPSBXVEZNb3ZlKGhhbmRsZXIpLCBvcmlnaW5hbFJlcXVlc3QgPSBXVEZN b3ZlKG9yaWdpbmFsUmVxdWVzdCldKGF1dG8gcmVzdWx0KSBtdXRhYmxlIHsKKyAgICAgICAgICAg IGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAgcmV0dXJuIGhhbmRsZXIoeyBSZXNvdXJj ZUVycm9yIHsgUmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uIH19KTsKKwogICAgICAg ICAgICAgaWYgKCFyZXN1bHQuaGFzX3ZhbHVlKCkpIHsKICAgICAgICAgICAgICAgICBBU1NFUlQo cmVzdWx0LmVycm9yKCkuaXNDYW5jZWxsYXRpb24oKSk7CiAgICAgICAgICAgICAgICAgaGFuZGxl cihXVEZNb3ZlKHJlc3VsdC5lcnJvcigpKSk7Cg== 363539 2019-03-04 12:19:56 -0800 2019-03-04 12:54:50 -0800 Patch bug-195238-20190304121955.patch text/plain 2786 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDIzNjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTAzLTA0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGNyYXNoZXMg d2hlbiBOZXR3b3JrUmVzb3VyY2VMb2FkZXIvTmV0d29ya0xvYWRDaGVja2VyIGFyZSBkZXN0cm95 ZWQgZHVyaW5nIEhUVFBTIHVwZ3JhZGUgY2hlY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTIzOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDc1 OTg2NTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrTG9hZENoZWNrZXI6OmNoZWNrUmVxdWVzdCk6CisKIDIwMTktMDMtMDQgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9O OiAoIHIyNDA5NzgtcjI0MDk4NSApIFsgaU9TIFJlbGVhc2UgXSBMYXlvdXQgVGVzdCBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3hoci9zZW5kLXJlZGlyZWN0LXBvc3QtdXBsb2FkLmh0 bSBpcyBjcmFzaGluZwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr TG9hZENoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcAkocmV2aXNpb24gMjQyMzAxKQorKysgU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMjQsNyArMjI0LDkgQEAgdm9pZCBOZXR3b3JrTG9hZENoZWNrZXI6OmNoZWNrUmVxdWVz dChSZQogewogICAgIFJlc291cmNlUmVxdWVzdCBvcmlnaW5hbFJlcXVlc3QgPSByZXF1ZXN0Owog Ci0gICAgYXBwbHlIVFRQU1VwZ3JhZGVJZk5lZWRlZChXVEZNb3ZlKHJlcXVlc3QpLCBbdGhpcywg Y2xpZW50LCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwgb3JpZ2luYWxSZXF1ZXN0ID0gV1RG TW92ZShvcmlnaW5hbFJlcXVlc3QpXShhdXRvIHJlcXVlc3QpIG11dGFibGUgeworICAgIGFwcGx5 SFRUUFNVcGdyYWRlSWZOZWVkZWQoV1RGTW92ZShyZXF1ZXN0KSwgW3RoaXMsIHdlYWtUaGlzID0g bWFrZVdlYWtQdHIoKnRoaXMpLCBjbGllbnQsIGhhbmRsZXIgPSBXVEZNb3ZlKGhhbmRsZXIpLCBv cmlnaW5hbFJlcXVlc3QgPSBXVEZNb3ZlKG9yaWdpbmFsUmVxdWVzdCldKGF1dG8gcmVxdWVzdCkg bXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm4gaGFu ZGxlcih7IFJlc291cmNlRXJyb3IgeyBSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24g fX0pOwogCiAgICAgICAgIGlmIChhdXRvKiBjb250ZW50U2VjdXJpdHlQb2xpY3kgPSB0aGlzLT5j b250ZW50U2VjdXJpdHlQb2xpY3koKSkgewogICAgICAgICAgICAgaWYgKHRoaXMtPmlzUmVkaXJl Y3RlZCgpKSB7CkBAIC0yMzgsNyArMjQwLDcgQEAgdm9pZCBOZXR3b3JrTG9hZENoZWNrZXI6OmNo ZWNrUmVxdWVzdChSZQogICAgICAgICB9CiAKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05T KQotICAgICAgICB0aGlzLT5wcm9jZXNzQ29udGVudEV4dGVuc2lvblJ1bGVzRm9yTG9hZChXVEZN b3ZlKHJlcXVlc3QpLCBbdGhpcywgaGFuZGxlciA9IFdURk1vdmUoaGFuZGxlciksIG9yaWdpbmFs UmVxdWVzdCA9IFdURk1vdmUob3JpZ2luYWxSZXF1ZXN0KV0oYXV0byByZXN1bHQpIG11dGFibGUg eworICAgICAgICB0aGlzLT5wcm9jZXNzQ29udGVudEV4dGVuc2lvblJ1bGVzRm9yTG9hZChXVEZN b3ZlKHJlcXVlc3QpLCBbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlzKSwgaGFuZGxl ciA9IFdURk1vdmUoaGFuZGxlciksIG9yaWdpbmFsUmVxdWVzdCA9IFdURk1vdmUob3JpZ2luYWxS ZXF1ZXN0KV0oYXV0byByZXN1bHQpIG11dGFibGUgewogICAgICAgICAgICAgaWYgKCFyZXN1bHQu aGFzX3ZhbHVlKCkpIHsKICAgICAgICAgICAgICAgICBBU1NFUlQocmVzdWx0LmVycm9yKCkuaXND YW5jZWxsYXRpb24oKSk7CiAgICAgICAgICAgICAgICAgaGFuZGxlcihXVEZNb3ZlKHJlc3VsdC5l cnJvcigpKSk7CkBAIC0yNDksNiArMjUxLDggQEAgdm9pZCBOZXR3b3JrTG9hZENoZWNrZXI6OmNo ZWNrUmVxdWVzdChSZQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAor ICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICByZXR1cm4gaGFuZGxl cih7IFJlc291cmNlRXJyb3IgeyBSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24gfX0p OwogICAgICAgICAgICAgdGhpcy0+Y29udGludWVDaGVja2luZ1JlcXVlc3RPckRvU3ludGhldGlj UmVkaXJlY3QoV1RGTW92ZShvcmlnaW5hbFJlcXVlc3QpLCBXVEZNb3ZlKHJlc3VsdC52YWx1ZSgp LnJlcXVlc3QpLCBXVEZNb3ZlKGhhbmRsZXIpKTsKICAgICAgICAgfSk7CiAjZWxzZQo=