172045 2017-05-12 13:56:24 -0700 Null deref under WebContentReader::readURL when interacting with a file URL 2017-05-15 12:22:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin enrica simon.fraser wenson_hsieh oldest_to_newest 1308042 0 thorton 2017-05-12 13:56:24 -0700 Null deref under WebContentReader::readURL when interacting with a file URL 1308045 1 309940 thorton 2017-05-12 13:57:01 -0700 Created attachment 309940 Patch 1308203 2 309940 wenson_hsieh 2017-05-12 18:12:20 -0700 Comment on attachment 309940 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309940&action=review > Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:550 > + EXPECT_WK_STREQ("<null>", [webView stringByEvaluatingJavaScript:@"editor.querySelector('a')"]); Nit - Could we make this EXPECT_FALSE([[webView stringByEvaluatingJavaScript:@"!!editor.querySelector('a')"] boolValue]) instead? 1308751 3 thorton 2017-05-15 12:22:08 -0700 https://trac.webkit.org/changeset/216868/webkit 309940 2017-05-12 13:57:01 -0700 2017-05-12 18:12:20 -0700 Patch bug-172045-20170512135700.patch text/plain 6922 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2NjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NlZGFmMmVmZDhlYmNm NDkyMjBhNjllNzQwNTg5NGMxOWY1ZGJmOC4uMzk5ZGFlYzQyMzA3MmY1NjBkM2ViZWQyNTk1MGJi YjE1ZjNkYmIwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA1LTEyICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBOdWxsIGRl cmVmIHVuZGVyIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRVUkwgd2hlbiBpbnRlcmFjdGluZyB3aXRo IGEgZmlsZSBVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3MjA0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjU4ODA2NDc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL2lvcy9FZGl0 b3JJT1MubW06CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OldlYkNvbnRlbnRSZWFkZXI6OnJl YWRVUkwpOgorICAgICAgICBUaGUgQXBwU3VwcG9ydCBzb2Z0IGxpbmsgd2FzIHdyb25nLCBhcyB0 aGVyZSBpcyBubyBzdWNoIGZyYW1ld29yayBpbiAvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy4K KyAgICAgICAgVGh1cywgYW55IHRpbWUgd2UgaGl0IHRoaXMgY29kZXBhdGgsIHRoZSBzb2Z0IGxp bmtlZCBmdW5jdGlvbiB3b3VsZCBiZSBudWxsLCBhbmQgY2FsbGluZyBpdCB3b3VsZCBjcmFzaC4K KyAgICAgICAgSW5zdGVhZCBvZiBqdXN0IGZpeGluZyB0aGUgc29mdCBsaW5rLCByZW1vdmUgdGhl IGNvZGUsIGJlY2F1c2UgaXQgZG9lcyBub3Qgc2VlbSBuZWNlc3NhcnkgdG8KKyAgICAgICAgc3Bl Y2lhbC1jYXNlIGZpbGVVUkxzIHRvIGltYWdlcyBpbiB0aGUgbWVkaWEgZGlyZWN0b3J5LgorCiAy MDE3LTA1LTExICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXgg YSBzcGVsbGluZyBtaXN0YWtlIGluIEFwcGxlUGF5RXJyb3JDb2RlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2lvcy9FZGl0b3JJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2lvcy9FZGl0b3JJT1MubW0KaW5kZXggNDQ1YmUxMTI2NTg3ODQ5NDJlZTI2NzE1NmY0YWU2 OWQ0MjM2NWFkNi4uZTRjNDk0YjljOTVkYTVmYjc4ZjdmMzJjNmM0NmY2MjAzYTQzZDc0MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9pb3MvRWRpdG9ySU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvaW9zL0VkaXRvcklPUy5tbQpAQCAtNjQsOSArNjQsNiBAQAog I2ltcG9ydCA8TW9iaWxlQ29yZVNlcnZpY2VzL01vYmlsZUNvcmVTZXJ2aWNlcy5oPgogI2ltcG9y dCA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgogCi1TT0ZUX0xJTktfRlJBTUVXT1JLKEFwcFN1 cHBvcnQpCi1TT0ZUX0xJTksoQXBwU3VwcG9ydCwgQ1BTaGFyZWRSZXNvdXJjZXNEaXJlY3Rvcnks IENGU3RyaW5nUmVmLCAodm9pZCksICgpKQotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5n IG5hbWVzcGFjZSBIVE1MTmFtZXM7CkBAIC0zMzAsMzQgKzMyNywxOSBAQCBib29sIEVkaXRvcjo6 V2ViQ29udGVudFJlYWRlcjo6cmVhZFVSTChjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB0 aXRsZSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAotICAgIGlmIChbKE5TVVJM ICopdXJsIGlzRmlsZVVSTF0pIHsKLSAgICAgICAgTlNTdHJpbmcgKmxvY2FsUGF0aCA9IFsoTlNV UkwgKil1cmwgcmVsYXRpdmVQYXRoXTsKLSAgICAgICAgLy8gT25seSBhbGxvdyB1cmwgYXR0YWNo bWVudHMgZnJvbSB+L01lZGlhIGZvciBub3cuCi0gICAgICAgIGlmICghW2xvY2FsUGF0aCBoYXNQ cmVmaXg6WyhOU1N0cmluZyAqKUNQU2hhcmVkUmVzb3VyY2VzRGlyZWN0b3J5KCkgc3RyaW5nQnlB cHBlbmRpbmdTdHJpbmc6QCIvTWVkaWEvRENJTS8iXV0pCi0gICAgICAgICAgICByZXR1cm4gZmFs c2U7Ci0KLSAgICAgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBmaWxlVHlwZSA9IGFkb3B0TlMoKE5T U3RyaW5nICopVVRUeXBlQ3JlYXRlUHJlZmVycmVkSWRlbnRpZmllckZvclRhZyhrVVRUYWdDbGFz c0ZpbGVuYW1lRXh0ZW5zaW9uLCAoQ0ZTdHJpbmdSZWYpW2xvY2FsUGF0aCBwYXRoRXh0ZW5zaW9u XSwgTlVMTCkpOwotICAgICAgICBOU0RhdGEgKmRhdGEgPSBbTlNEYXRhIGRhdGFXaXRoQ29udGVu dHNPZkZpbGU6bG9jYWxQYXRoXTsKLSAgICAgICAgaWYgKFVUVHlwZUNvbmZvcm1zVG8oKENGU3Ry aW5nUmVmKWZpbGVUeXBlLmdldCgpLCBrVVRUeXBlUE5HKSkgewotICAgICAgICAgICAgYWRkRnJh Z21lbnQoZnJhbWUuZWRpdG9yKCkuY3JlYXRlRnJhZ21lbnRGb3JJbWFnZVJlc291cmNlQW5kQWRk UmVzb3VyY2UoQXJjaGl2ZVJlc291cmNlOjpjcmVhdGUoU2hhcmVkQnVmZmVyOjpjcmVhdGUoW1tk YXRhIGNvcHldIGF1dG9yZWxlYXNlXSksIFVSTDo6ZmFrZVVSTFdpdGhSZWxhdGl2ZVBhcnQoImlt YWdlLnBuZyIpLCBAImltYWdlL3BuZyIsIGVtcHR5U3RyaW5nKCksIGVtcHR5U3RyaW5nKCkpKSk7 Ci0gICAgICAgICAgICByZXR1cm4gZnJhZ21lbnQ7Ci0gICAgICAgIH0gZWxzZSBpZiAoVVRUeXBl Q29uZm9ybXNUbygoQ0ZTdHJpbmdSZWYpZmlsZVR5cGUuZ2V0KCksIGtVVFR5cGVKUEVHKSkgewot ICAgICAgICAgICAgYWRkRnJhZ21lbnQoZnJhbWUuZWRpdG9yKCkuY3JlYXRlRnJhZ21lbnRGb3JJ bWFnZVJlc291cmNlQW5kQWRkUmVzb3VyY2UoQXJjaGl2ZVJlc291cmNlOjpjcmVhdGUoU2hhcmVk QnVmZmVyOjpjcmVhdGUoW1tkYXRhIGNvcHldIGF1dG9yZWxlYXNlXSksIFVSTDo6ZmFrZVVSTFdp dGhSZWxhdGl2ZVBhcnQoImltYWdlLmpwZyIpLCBAImltYWdlL2pwZyIsIGVtcHR5U3RyaW5nKCks IGVtcHR5U3RyaW5nKCkpKSk7Ci0gICAgICAgICAgICByZXR1cm4gZnJhZ21lbnQ7Ci0gICAgICAg IH0KLSAgICB9IGVsc2UgewotICAgICAgICBhdXRvIGFuY2hvciA9IEhUTUxBbmNob3JFbGVtZW50 OjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50KCkpOwotICAgICAgICBhbmNob3ItPnNldEF0dHJpYnV0 ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjpocmVmQXR0ciwgdXJsLnN0cmluZygp KTsKKyAgICBpZiAoWyhOU1VSTCAqKXVybCBpc0ZpbGVVUkxdKQorICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICAgICAgU3RyaW5nIGxpbmtUZXh0ID0gdGl0bGUubGVuZ3RoKCkgPyB0aXRsZSA6 IFN0cmluZyhbWyhOU1VSTCAqKXVybCBhYnNvbHV0ZVN0cmluZ10gcHJlY29tcG9zZWRTdHJpbmdX aXRoQ2Fub25pY2FsTWFwcGluZ10pOwotICAgICAgICBhbmNob3ItPmFwcGVuZENoaWxkKGZyYW1l LmRvY3VtZW50KCktPmNyZWF0ZVRleHROb2RlKGxpbmtUZXh0KSk7CisgICAgYXV0byBhbmNob3Ig PSBIVE1MQW5jaG9yRWxlbWVudDo6Y3JlYXRlKCpmcmFtZS5kb2N1bWVudCgpKTsKKyAgICBhbmNo b3ItPnNldEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjpocmVmQXR0 ciwgdXJsLnN0cmluZygpKTsKIAotICAgICAgICBhdXRvIG5ld0ZyYWdtZW50ID0gZnJhbWUuZG9j dW1lbnQoKS0+Y3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpOwotICAgICAgICBuZXdGcmFnbWVudC0+ YXBwZW5kQ2hpbGQoYW5jaG9yKTsKLSAgICAgICAgYWRkRnJhZ21lbnQoV1RGTW92ZShuZXdGcmFn bWVudCkpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwor ICAgIFN0cmluZyBsaW5rVGV4dCA9IHRpdGxlLmxlbmd0aCgpID8gdGl0bGUgOiBTdHJpbmcoW1so TlNVUkwgKil1cmwgYWJzb2x1dGVTdHJpbmddIHByZWNvbXBvc2VkU3RyaW5nV2l0aENhbm9uaWNh bE1hcHBpbmddKTsKKyAgICBhbmNob3ItPmFwcGVuZENoaWxkKGZyYW1lLmRvY3VtZW50KCktPmNy ZWF0ZVRleHROb2RlKGxpbmtUZXh0KSk7CisKKyAgICBhdXRvIG5ld0ZyYWdtZW50ID0gZnJhbWUu ZG9jdW1lbnQoKS0+Y3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpOworICAgIG5ld0ZyYWdtZW50LT5h cHBlbmRDaGlsZChhbmNob3IpOworICAgIGFkZEZyYWdtZW50KFdURk1vdmUobmV3RnJhZ21lbnQp KTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogYm9vbCBFZGl0b3I6OldlYkNvbnRlbnRSZWFkZXI6 OnJlYWRQbGFpblRleHQoY29uc3QgU3RyaW5nJiB0ZXh0KQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDdkZmY0Y2Y1NmI2ZGU5OTc2ZTM0ODI2NDY0 YWZhYjNhMDAyYzQ5ZDAuLmJlNTljN2JhMDA5ZmMxNDI5MzYwMjg0Y2MzZjE3NjJkNGJhZDNkZTUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxNy0wNS0xMiAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CisKKyAgICAgICAgTnVsbCBkZXJlZiB1bmRlciBXZWJDb250ZW50UmVhZGVyOjpy ZWFkVVJMIHdoZW4gaW50ZXJhY3Rpbmcgd2l0aCBhIGZpbGUgVVJMCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzIwNDUKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzI1ODgwNjQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMu bW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKyAgICAgICAgVGhlIHRleHQgb2Yg dGhlIGZpbGUgVVJMIGlzIHBhc3RlZCBiZWNhdXNlIGEgdGV4dHVhbCB2ZXJzaW9uIG9mIGl0IGdl dHMKKyAgICAgICAgb250byB0aGUgcGFzdGVib2FyZC4gSG93ZXZlciwgdGhpcyB0ZXN0IHdvdWxk IGhhdmUgY3Jhc2hlZCBiZWZvcmUuIEFsc28KKyAgICAgICAgdGVzdHMgdGhhdCB3ZSBkb24ndCBt YWtlIGFuIDxhPi4KKwogMjAxNy0wNS0xMSAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxj bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBBZGQgV1BFIHJlbGVhc2UgYm90cwpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMu bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25UZXN0cy5t bQppbmRleCAxYzcxMTBmZjcyODAyZGYzYmZkZjZjZDZkNjk3N2I5YjQ2MzdlOTg5Li5hM2JiZTIx Y2RjNjJiMTZlYTlhZGM5NTU5MTkwZDU4NTgzNmY2YmYzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25UZXN0cy5tbQorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25UZXN0cy5tbQpAQCAtNTM0LDYg KzUzNCwyNCBAQCBURVNUKERhdGFJbnRlcmFjdGlvblRlc3RzLCBFeHRlcm5hbFNvdXJjZVRpdGxl ZE5TVVJMKQogICAgIEVYUEVDVF9XS19TVFJFUSgiaHR0cHM6Ly93d3cuYXBwbGUuY29tLyIsIFt3 ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJlZGl0b3IucXVlcnlTZWxlY3Rv cignYScpLmhyZWYiXSk7CiB9CiAKK1RFU1QoRGF0YUludGVyYWN0aW9uVGVzdHMsIEV4dGVybmFs U291cmNlRmlsZVVSTCkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMyMCwgNTAwKV0pOwor ICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkVGVzdFBhZ2VOYW1lZDpAImF1dG9mb2N1cy1j b250ZW50ZWRpdGFibGUiXTsKKyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2Ny aXB0OkAiZ2V0U2VsZWN0aW9uKCkucmVtb3ZlQWxsUmFuZ2VzKCkiXTsKKworICAgIE5TVVJMICpV UkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzpAImZpbGU6Ly8vc29tZS9maWxlL3RoYXQvaXMvbm90 L3JlYWwiXTsKKyAgICBVSUl0ZW1Qcm92aWRlciAqc2ltdWxhdGVkSXRlbVByb3ZpZGVyID0gW1VJ SXRlbVByb3ZpZGVyIGl0ZW1Qcm92aWRlcldpdGhVUkw6VVJMIHRpdGxlOkAiIl07CisKKyAgICBh dXRvIGRhdGFJbnRlcmFjdGlvblNpbXVsYXRvciA9IGFkb3B0TlMoW1tEYXRhSW50ZXJhY3Rpb25T aW11bGF0b3IgYWxsb2NdIGluaXRXaXRoV2ViVmlldzp3ZWJWaWV3LmdldCgpXSk7CisgICAgW2Rh dGFJbnRlcmFjdGlvblNpbXVsYXRvciBzZXRFeHRlcm5hbEl0ZW1Qcm92aWRlcnM6QFsgc2ltdWxh dGVkSXRlbVByb3ZpZGVyIF1dOworICAgIFtkYXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgcnVuRnJv bTpDR1BvaW50TWFrZSgzMDAsIDQwMCkgdG86Q0dQb2ludE1ha2UoMTAwLCAzMDApXTsKKworICAg IEVYUEVDVF9XS19TVFJFUSgiPG51bGw+IiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2 YVNjcmlwdDpAImVkaXRvci5xdWVyeVNlbGVjdG9yKCdhJykiXSk7CisKKyAgICBFWFBFQ1RfV0tf U1RSRVEoIkhlbGxvIHdvcmxkXG5maWxlOi8vL3NvbWUvZmlsZS90aGF0L2lzL25vdC9yZWFsIiwg W3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LmJvZHkuaW5u ZXJUZXh0Il0pOworfQorCiBURVNUKERhdGFJbnRlcmFjdGlvblRlc3RzLCBPdmVycmlkZURhdGFJ bnRlcmFjdGlvbk9wZXJhdGlvbikKIHsKICAgICBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2Vi VmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVj dE1ha2UoMCwgMCwgMzIwLCA1MDApXSk7Cg==