62666 2011-06-14 15:04:35 -0700 Callers should be robust against WebImage::create() returning an image with a null snapshot 2011-06-14 22:29:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sullivan sullivan mitz sam oldest_to_newest 420748 0 sullivan 2011-06-14 15:04:35 -0700 We’ve seen some crashes caused by dereferencing a WebImage->bitmap(); the callers are assuming that WebImage->bitmap() will never return null, but it can return null in at least some cases where it can’t allocate enough memory. We should make the callers robust by having them check for null. In Radar as <rdar://problem/9606676> 420751 1 97169 sullivan 2011-06-14 15:13:08 -0700 Created attachment 97169 Patch that makes the callers of WebImage check for a null bitmap before dereferencing the bitmap 420753 2 mitz 2011-06-14 15:15:53 -0700 Assuming a change log 420754 3 sullivan 2011-06-14 15:17:28 -0700 I forgot to add the ChangeLog before uploading the patch, but I will commit it along with the patch. 420755 4 sullivan 2011-06-14 15:18:38 -0700 Fixed in http://trac.webkit.org/changeset/88856 420948 5 sam 2011-06-14 18:53:49 -0700 This patch wasn't quite right. We shouldn't be null checking arguments to API functions. I will post a follow up patch in a moment. 420966 6 97222 sam 2011-06-14 19:41:52 -0700 Created attachment 97222 Patch 421015 7 sam 2011-06-14 22:29:13 -0700 Committed r88906: <http://trac.webkit.org/changeset/88906> 97169 2011-06-14 15:13:08 -0700 2011-06-14 19:41:48 -0700 Patch that makes the callers of WebImage check for a null bitmap before dereferencing the bitmap 62666_patch.txt text/plain 3693 sullivan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Vc2VyTWVzc2FnZUNvZGVycy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Vc2VyTWVzc2FnZUNvZGVycy5oCShyZXZpc2lv biA4ODY0MykKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Vc2VyTWVzc2FnZUNvZGVycy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjcsMTMgKzEyNywxMyBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAg ICAgICAgY2FzZSBBUElPYmplY3Q6OlR5cGVJbWFnZTogewogICAgICAgICAgICAgV2ViSW1hZ2Uq IGltYWdlID0gc3RhdGljX2Nhc3Q8V2ViSW1hZ2UqPihtX3Jvb3QpOwotICAgICAgICAgICAgaWYg KCFpbWFnZS0+Yml0bWFwKCktPmlzQmFja2VkQnlTaGFyZWRNZW1vcnkoKSkgeworICAgICAgICAg ICAgaWYgKCFpbWFnZS0+Yml0bWFwKCkgfHwgIWltYWdlLT5iaXRtYXAoKS0+aXNCYWNrZWRCeVNo YXJlZE1lbW9yeSgpKSB7CiAgICAgICAgICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKGZhbHNlKTsK ICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAg ICAgU2hhcmVhYmxlQml0bWFwOjpIYW5kbGUgaGFuZGxlOwotICAgICAgICAgICAgaWYgKCFpbWFn ZS0+Yml0bWFwKCktPmNyZWF0ZUhhbmRsZShoYW5kbGUpKQorICAgICAgICAgICAgaWYgKCFpbWFn ZS0+Yml0bWFwKCkgfHwgIWltYWdlLT5iaXRtYXAoKS0+Y3JlYXRlSGFuZGxlKGhhbmRsZSkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICBlbmNvZGVyLT5lbmNv ZGUodHJ1ZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvY2cvV0tJbWFnZUNH LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvY2cvV0tJbWFn ZUNHLmNwcAkocmV2aXNpb24gODg2NDMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2Mv Y2cvV0tJbWFnZUNHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsMTMgKzM2LDI2IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCiBDR0ltYWdlUmVmIFdLSW1hZ2VDcmVhdGVDR0ltYWdlKFdL SW1hZ2VSZWYgaW1hZ2VSZWYpCiB7Ci0gICAgcmV0dXJuIHRvSW1wbChpbWFnZVJlZiktPmJpdG1h cCgpLT5tYWtlQ0dJbWFnZUNvcHkoKS5sZWFrUmVmKCk7CisgICAgaWYgKCFpbWFnZVJlZikKKyAg ICAgICAgcmV0dXJuIDA7CisgICAgCisgICAgV2ViSW1hZ2UqIHdlYkltYWdlID0gdG9JbXBsKGlt YWdlUmVmKTsKKyAgICBpZiAoIXdlYkltYWdlIHx8ICF3ZWJJbWFnZS0+Yml0bWFwKCkpCisgICAg ICAgIHJldHVybiAwOworICAgIAorICAgIHJldHVybiB3ZWJJbWFnZS0+Yml0bWFwKCktPm1ha2VD R0ltYWdlQ29weSgpLmxlYWtSZWYoKTsKIH0KIAogV0tJbWFnZVJlZiBXS0ltYWdlQ3JlYXRlRnJv bUNHSW1hZ2UoQ0dJbWFnZVJlZiBpbWFnZVJlZiwgV0tJbWFnZU9wdGlvbnMgb3B0aW9ucykKIHsK KyAgICBpZiAoIWltYWdlUmVmKQorICAgICAgICByZXR1cm4gMDsKKyAgICAKICAgICBJbnRTaXpl IGltYWdlU2l6ZShDR0ltYWdlR2V0V2lkdGgoaW1hZ2VSZWYpLCBDR0ltYWdlR2V0SGVpZ2h0KGlt YWdlUmVmKSk7CiAgICAgUmVmUHRyPFdlYkltYWdlPiB3ZWJJbWFnZSA9IFdlYkltYWdlOjpjcmVh dGUoaW1hZ2VTaXplLCB0b0ltYWdlT3B0aW9ucyhvcHRpb25zKSk7CisgICAgaWYgKCF3ZWJJbWFn ZSB8fCAhd2ViSW1hZ2UtPmJpdG1hcCgpKQorICAgICAgICByZXR1cm4gMDsKKyAgICAKICAgICBP d25QdHI8R3JhcGhpY3NDb250ZXh0PiBncmFwaGljc0NvbnRleHQgPSB3ZWJJbWFnZS0+Yml0bWFw KCktPmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOwogICAgIENHQ29udGV4dERyYXdJbWFnZShncmFw aGljc0NvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCBDR1JlY3RNYWtlKDAsIDAsIGltYWdlU2l6 ZS53aWR0aCgpLCBpbWFnZVNpemUuaGVpZ2h0KCkpLCBpbWFnZVJlZik7CiAgICAgcmV0dXJuIHRv QVBJKHdlYkltYWdlLnJlbGVhc2UoKS5sZWFrUmVmKCkpOwpJbmRleDogU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gODg2NDMpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTg3NSw2ICs4NzUsOSBAQCBQYXNzUmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlOjpzbmFw c2hvdEluCiAgICAgZnJhbWVWaWV3LT5zZXRQYWludEJlaGF2aW9yKG9sZEJlaGF2aW9yIHwgUGFp bnRCZWhhdmlvckZsYXR0ZW5Db21wb3NpdGluZ0xheWVycyk7CiAKICAgICBSZWZQdHI8V2ViSW1h Z2U+IHNuYXBzaG90ID0gV2ViSW1hZ2U6OmNyZWF0ZShyZWN0LnNpemUoKSwgb3B0aW9ucyk7Cisg ICAgaWYgKCFzbmFwc2hvdC0+Yml0bWFwKCkpCisgICAgICAgIHJldHVybiAwOworICAgIAogICAg IE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNzQ29udGV4dCA9IHNuYXBz aG90LT5iaXRtYXAoKS0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7CiAKICAgICBncmFwaGljc0Nv bnRleHQtPnNhdmUoKTsKQEAgLTkwNCw2ICs5MDcsOSBAQCBQYXNzUmVmUHRyPFdlYkltYWdlPiBX ZWJQYWdlOjpzY2FsZWRTbmFwCiAgICAgICAgIHNpemUgPSBJbnRTaXplKGNlaWwocmVjdC53aWR0 aCgpICogc2NhbGVGYWN0b3IpLCBjZWlsKHJlY3QuaGVpZ2h0KCkgKiBzY2FsZUZhY3RvcikpOwog CiAgICAgUmVmUHRyPFdlYkltYWdlPiBzbmFwc2hvdCA9IFdlYkltYWdlOjpjcmVhdGUoc2l6ZSwg b3B0aW9ucyk7CisgICAgaWYgKCFzbmFwc2hvdC0+Yml0bWFwKCkpCisgICAgICAgIHJldHVybiAw OworICAgIAogICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNzQ29u dGV4dCA9IHNuYXBzaG90LT5iaXRtYXAoKS0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7CiAgICAg Z3JhcGhpY3NDb250ZXh0LT5zYXZlKCk7CiAgICAgCkBAIC05MjksOCArOTM1LDEyIEBAIHZvaWQg V2ViUGFnZTo6Y3JlYXRlU25hcHNob3RPZlZpc2libGVDb24KICAgICBGcmFtZVZpZXcqIGZyYW1l VmlldyA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpOwogICAgIGlmICghZnJhbWVW aWV3KQogICAgICAgICByZXR1cm47CisgICAgCiAgICAgSW50UmVjdCBjb250ZW50UmVjdCA9IGZy YW1lVmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KGZhbHNlKTsKICAgICBSZWZQdHI8V2ViSW1hZ2U+ IHNuYXBzaG90SW1hZ2UgPSBzY2FsZWRTbmFwc2hvdEluRG9jdW1lbnRDb29yZGluYXRlcyhjb250 ZW50UmVjdCwgMSwgSW1hZ2VPcHRpb25zU2hhcmVhYmxlKTsKKyAgICBpZiAoIXNuYXBzaG90SW1h Z2UtPmJpdG1hcCgpKQorICAgICAgICByZXR1cm47CisgICAgCiAgICAgc25hcHNob3RJbWFnZS0+ Yml0bWFwKCktPmNyZWF0ZUhhbmRsZShzbmFwc2hvdEhhbmRsZSk7CiB9CiAK 97222 2011-06-14 19:41:52 -0700 2011-06-14 21:46:48 -0700 Patch bug-62666-20110614194151.patch text/plain 3376 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4ODk1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTQgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGb2xsb3cgdXAgZm9yIENhbGxlcnMgc2hvdWxkIGJlIHJvYnVzdCBhZ2Fp bnN0IFdlYkltYWdlOjpjcmVhdGUoKSByZXR1cm5pbmcgYW4gaW1hZ2Ugd2l0aCBhIG51bGwgc25h cHNob3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYy NjY2CisKKyAgICAgICAgKiBTaGFyZWQvQVBJL2MvY2cvV0tJbWFnZUNHLmNwcDoKKyAgICAgICAg KFdLSW1hZ2VDcmVhdGVDR0ltYWdlKToKKyAgICAgICAgKFdLSW1hZ2VDcmVhdGVGcm9tQ0dJbWFn ZSk6CisgICAgICAgIERvbid0IG51bGwgY2hlY2sgdGhlIGFyZ3VtZW50cyAoYXMgcGVyIG91ciBB UEkgZGVzaWduKSBvciB0aGUgZGlyZWN0IHJlc3VsdCBvZiBXZWJJbWFnZTo6Y3JlYXRlLgorCisg ICAgICAgICogU2hhcmVkL1VzZXJNZXNzYWdlQ29kZXJzLmg6CisgICAgICAgIChXZWJLaXQ6OlVz ZXJNZXNzYWdlRW5jb2Rlcjo6YmFzZUVuY29kZSk6CisgICAgICAgIFJlbW92ZSByZWR1bmRhbnQg Y2hlY2sgYW5kIG1ha2Ugbm90IGJlaW5nIGFibGUgdG8gY3JlYXRlIGEgaGFuZGxlIHRoZSBzYW1l CisgICAgICAgIGFzIG5vdCBiZWluZyBiYWNrZWQgYnkgc2hhcmVhYmxlIG1lbW9yeS4KKwogMjAx MS0wNi0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNl ck1lc3NhZ2VDb2RlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNl ck1lc3NhZ2VDb2RlcnMuaAkocmV2aXNpb24gODg4OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvVXNlck1lc3NhZ2VDb2RlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDE3ICsxMjgsMTcg QEAgcHVibGljOgogICAgICAgICB9CiAgICAgICAgIGNhc2UgQVBJT2JqZWN0OjpUeXBlSW1hZ2U6 IHsKICAgICAgICAgICAgIFdlYkltYWdlKiBpbWFnZSA9IHN0YXRpY19jYXN0PFdlYkltYWdlKj4o bV9yb290KTsKLSAgICAgICAgICAgIGlmICghaW1hZ2UtPmJpdG1hcCgpIHx8ICFpbWFnZS0+Yml0 bWFwKCktPmlzQmFja2VkQnlTaGFyZWRNZW1vcnkoKSkgeworCisgICAgICAgICAgICBTaGFyZWFi bGVCaXRtYXA6OkhhbmRsZSBoYW5kbGU7CisgICAgICAgICAgICBpZiAoIWltYWdlLT5iaXRtYXAo KSB8fCAhaW1hZ2UtPmJpdG1hcCgpLT5pc0JhY2tlZEJ5U2hhcmVkTWVtb3J5KCkgfHwgIWltYWdl LT5iaXRtYXAoKS0+Y3JlYXRlSGFuZGxlKGhhbmRsZSkpIHsKKyAgICAgICAgICAgICAgICAvLyBJ bml0aWFsIGZhbHNlIGluZGljYXRlcyBubyBhbGxvY2F0ZWQgYml0bWFwIG9yIGlzIG5vdCBzaGFy ZWFibGUuCiAgICAgICAgICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKGZhbHNlKTsKICAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgU2hhcmVh YmxlQml0bWFwOjpIYW5kbGUgaGFuZGxlOwotICAgICAgICAgICAgaWYgKCFpbWFnZS0+Yml0bWFw KCkgfHwgIWltYWdlLT5iaXRtYXAoKS0+Y3JlYXRlSGFuZGxlKGhhbmRsZSkpCi0gICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotCisgICAgICAgICAgICAvLyBJbml0aWFsIHRydWUgaW5kaWNh dGVzIGEgYml0bWFwIHdhcyBhbGxvY2F0ZWQgYW5kIGlzIHNoYXJlYWJsZS4KICAgICAgICAgICAg IGVuY29kZXItPmVuY29kZSh0cnVlKTsKLSAgICAgICAgICAgIAorCiAgICAgICAgICAgICBlbmNv ZGVyLT5lbmNvZGUoaGFuZGxlKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvY2cvV0tJbWFnZUNHLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvY2cvV0tJbWFnZUNHLmNwcAko cmV2aXNpb24gODg4OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvY2cvV0tJbWFn ZUNHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsMTMgKzM2LDEwIEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiBDR0ltYWdlUmVmIFdLSW1hZ2VDcmVhdGVDR0ltYWdlKFdLSW1hZ2VSZWYg aW1hZ2VSZWYpCiB7Ci0gICAgaWYgKCFpbWFnZVJlZikKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAg CiAgICAgV2ViSW1hZ2UqIHdlYkltYWdlID0gdG9JbXBsKGltYWdlUmVmKTsKLSAgICBpZiAoIXdl YkltYWdlIHx8ICF3ZWJJbWFnZS0+Yml0bWFwKCkpCisgICAgaWYgKCF3ZWJJbWFnZS0+Yml0bWFw KCkpCiAgICAgICAgIHJldHVybiAwOwotICAgIAorCiAgICAgcmV0dXJuIHdlYkltYWdlLT5iaXRt YXAoKS0+bWFrZUNHSW1hZ2VDb3B5KCkubGVha1JlZigpOwogfQogCkBAIC01Myw5ICs1MCw5IEBA IFdLSW1hZ2VSZWYgV0tJbWFnZUNyZWF0ZUZyb21DR0ltYWdlKENHSW0KICAgICAKICAgICBJbnRT aXplIGltYWdlU2l6ZShDR0ltYWdlR2V0V2lkdGgoaW1hZ2VSZWYpLCBDR0ltYWdlR2V0SGVpZ2h0 KGltYWdlUmVmKSk7CiAgICAgUmVmUHRyPFdlYkltYWdlPiB3ZWJJbWFnZSA9IFdlYkltYWdlOjpj cmVhdGUoaW1hZ2VTaXplLCB0b0ltYWdlT3B0aW9ucyhvcHRpb25zKSk7Ci0gICAgaWYgKCF3ZWJJ bWFnZSB8fCAhd2ViSW1hZ2UtPmJpdG1hcCgpKQorICAgIGlmICghd2ViSW1hZ2UtPmJpdG1hcCgp KQogICAgICAgICByZXR1cm4gMDsKLSAgICAKKwogICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQ+ IGdyYXBoaWNzQ29udGV4dCA9IHdlYkltYWdlLT5iaXRtYXAoKS0+Y3JlYXRlR3JhcGhpY3NDb250 ZXh0KCk7CiAgICAgQ0dDb250ZXh0RHJhd0ltYWdlKGdyYXBoaWNzQ29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCksIENHUmVjdE1ha2UoMCwgMCwgaW1hZ2VTaXplLndpZHRoKCksIGltYWdlU2l6ZS5o ZWlnaHQoKSksIGltYWdlUmVmKTsKICAgICByZXR1cm4gdG9BUEkod2ViSW1hZ2UucmVsZWFzZSgp LmxlYWtSZWYoKSk7Cg==