29009 2009-09-07 07:01:08 -0700 [V8] Cleanup document/frame null-checking in V8DOMWindowCustom.cpp 2009-09-07 07:49:16 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 ager webkit-unassigned dglazkov eric oldest_to_newest 145139 0 ager 2009-09-07 07:01:08 -0700 The document and frame null checking in V8DOMWindowCustom.cpp is inconsistent and a couple of checks are missing. We should use the DOMWindow::document accessor and let that one null check the frame. We should always null check the result of that accessor. canAccessFrame returns false for a null frame - we should use that fact consistently. 145148 1 39145 ager 2009-09-07 07:24:24 -0700 Created attachment 39145 Be consistent in document and frame null checking. 145151 2 39145 eric 2009-09-07 07:49:12 -0700 Comment on attachment 39145 Be consistent in document and frame null checking. Clearing flags on attachment: 39145 Committed r48114: <http://trac.webkit.org/changeset/48114> 145152 3 eric 2009-09-07 07:49:16 -0700 All reviewed patches have been landed. Closing bug. 39145 2009-09-07 07:24:24 -0700 2009-09-07 07:49:11 -0700 Be consistent in document and frame null checking. null-checks.txt text/plain 5621 ager SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODExMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMDktMDcgIE1hZHMgQWdlciAgPGFnZXJAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtWOF0g Q2xlYW51cCBkb2N1bWVudC9mcmFtZSBudWxsLWNoZWNraW5nIGluIFY4RE9NV2luZG93Q3VzdG9t LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjkw MDkKKworICAgICAgICBCZSBjb25zaXN0ZW50IGluIGRvY3VtZW50IGFuZCBmcmFtZSBudWxsIGNo ZWNrcy4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpWOEN1c3RvbTo6V2luZG93U2V0VGltZW91dEltcGwpOgor ICAgICAgICAoV2ViQ29yZTo6QUNDRVNTT1JfR0VUVEVSKToKKyAgICAgICAgKFdlYkNvcmU6OkFD Q0VTU09SX1NFVFRFUik6CisgICAgICAgIChXZWJDb3JlOjpDQUxMQkFDS19GVU5DX0RFQ0wpOgor ICAgICAgICAoV2ViQ29yZTo6TkFNRURfUFJPUEVSVFlfR0VUVEVSKToKKyAgICAgICAgKFdlYkNv cmU6OlY4Q3VzdG9tOjpDbGVhclRpbWVvdXRJbXBsKToKKwogMjAwOS0wOS0wNyAgWGFuIExvcGV6 ICA8eGxvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3Jv bmhhLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93 Q3VzdG9tLmNwcAkocmV2aXNpb24gNDgwNDIpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTVdpbmRvd0N1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3LDEzICs2NywxMyBA QCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhDdXN0b206OldpbmRvd1NlCiAKICAgICBET01XaW5k b3cqIGltcCA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvTmF0aXZlT2JqZWN0PERPTVdpbmRvdz4o VjhDbGFzc0luZGV4OjpET01XSU5ET1csIGFyZ3MuSG9sZGVyKCkpOwogCi0gICAgaWYgKCFpbXAt PmZyYW1lKCkpCi0gICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7Ci0KICAgICBpZiAoIVY4 UHJveHk6OmNhbkFjY2Vzc0ZyYW1lKGltcC0+ZnJhbWUoKSwgdHJ1ZSkpCiAgICAgICAgIHJldHVy biB2ODo6VW5kZWZpbmVkKCk7CiAKLSAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRD b250ZXh0ID0gc3RhdGljX2Nhc3Q8U2NyaXB0RXhlY3V0aW9uQ29udGV4dCo+KGltcC0+ZnJhbWUo KS0+ZG9jdW1lbnQoKSk7CisgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0Q29udGV4 dCA9IHN0YXRpY19jYXN0PFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqPihpbXAtPmRvY3VtZW50KCkp OworCisgICAgaWYgKCFzY3JpcHRDb250ZXh0KQorICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5l ZCgpOwogCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGZ1bmN0aW9uID0gYXJnc1swXTsKIApA QCAtMTU3LDcgKzE1Nyw3IEBAIEFDQ0VTU09SX0dFVFRFUihET01XaW5kb3dFdmVudCkKICAgICAg ICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIAogICAgIEZyYW1lKiBmcmFtZSA9IFY4RE9NV3Jh cHBlcjo6Y29udmVydFRvTmF0aXZlT2JqZWN0PERPTVdpbmRvdz4oVjhDbGFzc0luZGV4OjpET01X SU5ET1csIGhvbGRlciktPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSB8fCAhVjhQcm94eTo6Y2Fu QWNjZXNzRnJhbWUoZnJhbWUsIHRydWUpKQorICAgIGlmICghVjhQcm94eTo6Y2FuQWNjZXNzRnJh bWUoZnJhbWUsIHRydWUpKQogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogCiAgICAg djg6OkxvY2FsPHY4OjpDb250ZXh0PiBjb250ZXh0ID0gVjhQcm94eTo6Y29udGV4dChmcmFtZSk7 CkBAIC0xNzUsNyArMTc1LDcgQEAgQUNDRVNTT1JfU0VUVEVSKERPTVdpbmRvd0V2ZW50KQogICAg ICAgICByZXR1cm47CiAKICAgICBGcmFtZSogZnJhbWUgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRU b05hdGl2ZU9iamVjdDxET01XaW5kb3c+KFY4Q2xhc3NJbmRleDo6RE9NV0lORE9XLCBob2xkZXIp LT5mcmFtZSgpOwotICAgIGlmICghZnJhbWUgfHwgIVY4UHJveHk6OmNhbkFjY2Vzc0ZyYW1lKGZy YW1lLCB0cnVlKSkKKyAgICBpZiAoIVY4UHJveHk6OmNhbkFjY2Vzc0ZyYW1lKGZyYW1lLCB0cnVl KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBjb250ZXh0 ID0gVjhQcm94eTo6Y29udGV4dChmcmFtZSk7CkBAIC0yMzIsMTAgKzIzMiw4IEBAIENBTExCQUNL X0ZVTkNfREVDTChET01XaW5kb3dBZGRFdmVudExpc3QKICAgICBpZiAoIVY4UHJveHk6OmNhbkFj Y2Vzc0ZyYW1lKGltcC0+ZnJhbWUoKSwgdHJ1ZSkpCiAgICAgICAgIHJldHVybiB2ODo6VW5kZWZp bmVkKCk7CiAKLSAgICBpZiAoIWltcC0+ZnJhbWUoKSkKLSAgICAgICAgcmV0dXJuIHY4OjpVbmRl ZmluZWQoKTsgIC8vIERPTVdpbmRvdyBjb3VsZCBiZSBkaXNjb25uZWN0ZWQgZnJvbSB0aGUgZnJh bWUKLSAgCi0gICAgRG9jdW1lbnQqIGRvYyA9IGltcC0+ZnJhbWUoKS0+ZG9jdW1lbnQoKTsKKyAg ICBEb2N1bWVudCogZG9jID0gaW1wLT5kb2N1bWVudCgpOworCiAgICAgaWYgKCFkb2MpCiAgICAg ICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiAKQEAgLTI2NCwxMCArMjYyLDggQEAgQ0FMTEJB Q0tfRlVOQ19ERUNMKERPTVdpbmRvd1JlbW92ZUV2ZW50TAogICAgIGlmICghVjhQcm94eTo6Y2Fu QWNjZXNzRnJhbWUoaW1wLT5mcmFtZSgpLCB0cnVlKSkKICAgICAgICAgcmV0dXJuIHY4OjpVbmRl ZmluZWQoKTsKIAotICAgIGlmICghaW1wLT5mcmFtZSgpKQotICAgICAgICByZXR1cm4gdjg6OlVu ZGVmaW5lZCgpOworICAgIERvY3VtZW50KiBkb2MgPSBpbXAtPmRvY3VtZW50KCk7CiAKLSAgICBE b2N1bWVudCogZG9jID0gaW1wLT5mcmFtZSgpLT5kb2N1bWVudCgpOwogICAgIGlmICghZG9jKQog ICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogCkBAIC00MDQsMTAgKzQwMCw5IEBAIEFD Q0VTU09SX1NFVFRFUihET01XaW5kb3dFdmVudEhhbmRsZXIpCiAgICAgICAgIHJldHVybjsKIAog ICAgIERPTVdpbmRvdyogaW1wID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8 RE9NV2luZG93PihWOENsYXNzSW5kZXg6OkRPTVdJTkRPVywgaG9sZGVyKTsKLSAgICBpZiAoIWlt cC0+ZnJhbWUoKSkKLSAgICAgICAgcmV0dXJuOwogCi0gICAgRG9jdW1lbnQqIGRvYyA9IGltcC0+ ZnJhbWUoKS0+ZG9jdW1lbnQoKTsKKyAgICBEb2N1bWVudCogZG9jID0gaW1wLT5kb2N1bWVudCgp OworCiAgICAgaWYgKCFkb2MpCiAgICAgICAgIHJldHVybjsKIApAQCAtNDM1LDEwICs0MzAsOSBA QCBBQ0NFU1NPUl9HRVRURVIoRE9NV2luZG93RXZlbnRIYW5kbGVyKQogICAgICAgICByZXR1cm4g djg6OlVuZGVmaW5lZCgpOwogCiAgICAgRE9NV2luZG93KiBpbXAgPSBWOERPTVdyYXBwZXI6OmNv bnZlcnRUb05hdGl2ZU9iamVjdDxET01XaW5kb3c+KFY4Q2xhc3NJbmRleDo6RE9NV0lORE9XLCBo b2xkZXIpOwotICAgIGlmICghaW1wLT5mcmFtZSgpKQotICAgICAgICByZXR1cm4gdjg6OlVuZGVm aW5lZCgpOwogCi0gICAgRG9jdW1lbnQqIGRvYyA9IGltcC0+ZnJhbWUoKS0+ZG9jdW1lbnQoKTsK KyAgICBEb2N1bWVudCogZG9jID0gaW1wLT5kb2N1bWVudCgpOworCiAgICAgaWYgKCFkb2MpCiAg ICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiAKQEAgLTU3Myw3ICs1NjcsNyBAQCBDQUxM QkFDS19GVU5DX0RFQ0woRE9NV2luZG93U2hvd01vZGFsRGlhCiAgICAgICAgIFY4Q2xhc3NJbmRl eDo6RE9NV0lORE9XLCBhcmdzLkhvbGRlcigpKTsKICAgICBGcmFtZSogZnJhbWUgPSB3aW5kb3ct PmZyYW1lKCk7CiAKLSAgICBpZiAoIWZyYW1lIHx8ICFWOFByb3h5OjpjYW5BY2Nlc3NGcmFtZShm cmFtZSwgdHJ1ZSkpIAorICAgIGlmICghVjhQcm94eTo6Y2FuQWNjZXNzRnJhbWUoZnJhbWUsIHRy dWUpKQogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogCiAgICAgRnJhbWUqIGNhbGxp bmdGcmFtZSA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWVGb3JDYWxsaW5nQ29udGV4dCgpOwpAQCAt NjYxLDcgKzY1NSw3IEBAIENBTExCQUNLX0ZVTkNfREVDTChET01XaW5kb3dPcGVuKQogICAgIERP TVdpbmRvdyogcGFyZW50ID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8RE9N V2luZG93PihWOENsYXNzSW5kZXg6OkRPTVdJTkRPVywgYXJncy5Ib2xkZXIoKSk7CiAgICAgRnJh bWUqIGZyYW1lID0gcGFyZW50LT5mcmFtZSgpOwogCi0gICAgaWYgKCFmcmFtZSB8fCAhVjhQcm94 eTo6Y2FuQWNjZXNzRnJhbWUoZnJhbWUsIHRydWUpKQorICAgIGlmICghVjhQcm94eTo6Y2FuQWNj ZXNzRnJhbWUoZnJhbWUsIHRydWUpKQogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwog CiAgICAgRnJhbWUqIGNhbGxpbmdGcmFtZSA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWVGb3JDYWxs aW5nQ29udGV4dCgpOwpAQCAtODMzLDYgKzgyNyw3IEBAIE5BTUVEX1BST1BFUlRZX0dFVFRFUihE T01XaW5kb3cpCiAKICAgICAvLyBTZWFyY2ggbmFtZWQgaXRlbXMgaW4gdGhlIGRvY3VtZW50Lgog ICAgIERvY3VtZW50KiBkb2MgPSBmcmFtZS0+ZG9jdW1lbnQoKTsKKwogICAgIGlmIChkb2MpIHsK ICAgICAgICAgUmVmUHRyPEhUTUxDb2xsZWN0aW9uPiBpdGVtcyA9IGRvYy0+d2luZG93TmFtZWRJ dGVtcyhwcm9wTmFtZSk7CiAgICAgICAgIGlmIChpdGVtcy0+bGVuZ3RoKCkgPj0gMSkgewpAQCAt ODg0LDcgKzg3OSw5IEBAIHZvaWQgVjhDdXN0b206OkNsZWFyVGltZW91dEltcGwoY29uc3QgdjgK ICAgICBET01XaW5kb3cqIGltcCA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvTmF0aXZlT2JqZWN0 PERPTVdpbmRvdz4oVjhDbGFzc0luZGV4OjpET01XSU5ET1csIGhvbGRlcik7CiAgICAgaWYgKCFW OFByb3h5OjpjYW5BY2Nlc3NGcmFtZShpbXAtPmZyYW1lKCksIHRydWUpKQogICAgICAgICByZXR1 cm47Ci0gICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCA9IHN0YXRpY19jYXN0PFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqPihpbXAtPmZyYW1lKCktPmRvY3VtZW50KCkpOworICAgIFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQgPSBzdGF0aWNfY2FzdDxTY3JpcHRFeGVjdXRp b25Db250ZXh0Kj4oaW1wLT5kb2N1bWVudCgpKTsKKyAgICBpZiAoIWNvbnRleHQpCisgICAgICAg IHJldHVybjsKICAgICBpbnQgaGFuZGxlID0gdG9JbnQzMihhcmdzWzBdKTsKICAgICBET01UaW1l cjo6cmVtb3ZlQnlJZChjb250ZXh0LCBoYW5kbGUpOwogfQo=