200184 2019-07-26 16:45:25 -0700 Add a missing null check to ShareableBitmap::makeCGImageCopy() 2022-07-24 11:34:14 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=200185 InRadar P2 Normal --- 1 rniwa rniwa commit-queue ggaren njar09 simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1556282 0 rniwa 2019-07-26 16:45:25 -0700 ShareableBitmap::makeCGImageCopy() should have a null check for when createGraphicsContext() could return a nil. 1556283 1 rniwa 2019-07-26 16:45:48 -0700 <rdar://problem/53572444> 1556294 2 rniwa 2019-07-26 17:10:28 -0700 It's also possible that m_data of GraphicsContext to be null. Tracking this issue in the bug 200185. 1556296 3 375002 rniwa 2019-07-26 17:13:39 -0700 Created attachment 375002 Fixes the bug 1556298 4 375002 simon.fraser 2019-07-26 17:26:41 -0700 Comment on attachment 375002 Fixes the bug What about convertCGImageToBitmap()? 1556300 5 rniwa 2019-07-26 17:30:02 -0700 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 375002 [details] > Fixes the bug > > What about convertCGImageToBitmap()? Sure, I'll add the check there too. 1556302 6 375004 rniwa 2019-07-26 17:31:07 -0700 Created attachment 375004 Patch for landing 1556303 7 375002 simon.fraser 2019-07-26 17:31:50 -0700 Comment on attachment 375002 Fixes the bug I think you should make ShareableBitmap::createGraphicsContext() return nullptr and fix the ~10 call sites that we care about. 1556304 8 375004 simon.fraser 2019-07-26 17:32:24 -0700 Comment on attachment 375004 Patch for landing I think you should make ShareableBitmap::createGraphicsContext() return nullptr and fix the ~10 call sites that we care about. 1556338 9 rniwa 2019-07-26 20:10:02 -0700 (In reply to Simon Fraser (smfr) from comment #8) > Comment on attachment 375004 [details] > Patch for landing > > I think you should make ShareableBitmap::createGraphicsContext() return > nullptr and fix the ~10 call sites that we care about. That's done in https://bugs.webkit.org/show_bug.cgi?id=200185 375002 2019-07-26 17:13:39 -0700 2019-07-26 17:31:50 -0700 Fixes the bug bug-200184-20190726171338.patch text/plain 2353 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDc4ODUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA3LTI2ICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBhIG1pc3NpbmcgbnVsbCBjaGVj ayB0byBTaGFyZWFibGVCaXRtYXA6Om1ha2VDR0ltYWdlQ29weSgpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAxODQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIG51bGwgY2hlY2sgdG8gbWFr ZUNHSW1hZ2VDb3B5IHRvIHdoZW4gZWl0aGVyIEdyYXBoaWNzQ29udGV4dCBvciBpdHMgcGxhdGZv cm0gY29udGV4dCBpcyBudWxsLgorICAgICAgICBBZGRlZCB0aGUgc2FtZSBwbGF0Zm9ybSBjb250 ZXh0IG51bGwgY2hlY2sgdG8gY29udmVydEltYWdlVG9CaXRtYXAgc2luY2UgdGhlIGNyYXNoIGlz IHN0aWxsIGhhcHBlbmluZyBhZnRlciByMjQ3MTM0LgorCisgICAgICAgICogU2hhcmVkL2NnL1No YXJlYWJsZUJpdG1hcENHLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U2hhcmVhYmxlQml0bWFwOjpt YWtlQ0dJbWFnZUNvcHkpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFj L1dlYkRyYWdDbGllbnRNYWMubW06CisgICAgICAgIChXZWJLaXQ6OmNvbnZlcnRJbWFnZVRvQml0 bWFwKToKKwogMjAxOS0wNy0yNiAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgog CiAgICAgICAgIE5hdmlnYXRpb25TT0F1dGhvcml6YXRpb25TZXNzaW9uIHNob3VsZCBjaGVjayB0 aGUgYWN0aXZlIFVSTCBvZiB0aGUgcmVzcG9uZGluZyBwYWdlIGFmdGVyIHdha2luZyB1cCBmcm9t IHdhaXRpbmcKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL2NnL1NoYXJlYWJsZUJpdG1hcENH LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9jZy9TaGFyZWFibGVCaXRt YXBDRy5jcHAJKHJldmlzaW9uIDI0Nzg4MikKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL2NnL1No YXJlYWJsZUJpdG1hcENHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDYgKzExNCw5IEBAIHZv aWQgU2hhcmVhYmxlQml0bWFwOjpwYWludChXZWJDb3JlOjpHcmEKIFJldGFpblB0cjxDR0ltYWdl UmVmPiBTaGFyZWFibGVCaXRtYXA6Om1ha2VDR0ltYWdlQ29weSgpCiB7CiAgICAgYXV0byBncmFw aGljc0NvbnRleHQgPSBjcmVhdGVHcmFwaGljc0NvbnRleHQoKTsKKyAgICBpZiAoIWdyYXBoaWNz Q29udGV4dCB8fCAhZ3JhcGhpY3NDb250ZXh0LT5oYXNQbGF0Zm9ybUNvbnRleHQoKSkKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisKICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gaW1hZ2UgPSBh ZG9wdENGKENHQml0bWFwQ29udGV4dENyZWF0ZUltYWdlKGdyYXBoaWNzQ29udGV4dC0+cGxhdGZv cm1Db250ZXh0KCkpKTsKICAgICByZXR1cm4gaW1hZ2U7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJE cmFnQ2xpZW50TWFjLm1tCShyZXZpc2lvbiAyNDc4ODIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0JKHdvcmtpbmcgY29w eSkKQEAgLTY5LDcgKzY5LDcgQEAgc3RhdGljIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGNvbnZl cnRJbQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIGF1dG8gZ3JhcGhpY3NDb250ZXh0 ID0gYml0bWFwLT5jcmVhdGVHcmFwaGljc0NvbnRleHQoKTsKLSAgICBpZiAoIWdyYXBoaWNzQ29u dGV4dCkKKyAgICBpZiAoIWdyYXBoaWNzQ29udGV4dCB8fCAhZ3JhcGhpY3NDb250ZXh0LT5oYXNQ bGF0Zm9ybUNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBSZXRhaW5Q dHI8TlNHcmFwaGljc0NvbnRleHQ+IHNhdmVkQ29udGV4dCA9IFtOU0dyYXBoaWNzQ29udGV4dCBj dXJyZW50Q29udGV4dF07Cg== 375004 2019-07-26 17:31:07 -0700 2019-07-28 10:07:31 -0700 Patch for landing bug-200184-20190726173106.patch text/plain 2900 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDc4ODUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA3LTI2ICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBhIG1pc3NpbmcgbnVsbCBjaGVj ayB0byBTaGFyZWFibGVCaXRtYXA6Om1ha2VDR0ltYWdlQ29weSgpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAxODQKKworICAgICAgICBSZXZpZXdl ZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgQWRkZWQgYSBudWxsIGNoZWNrIHRvIG1ha2VD R0ltYWdlQ29weSB0byB3aGVuIGVpdGhlciBHcmFwaGljc0NvbnRleHQgb3IgaXRzIHBsYXRmb3Jt IGNvbnRleHQgaXMgbnVsbC4KKyAgICAgICAgQWRkZWQgdGhlIHNhbWUgcGxhdGZvcm0gY29udGV4 dCBudWxsIGNoZWNrIHRvIGNvbnZlcnRJbWFnZVRvQml0bWFwIGFuZCBjb252ZXJ0Q0dJbWFnZVRv Qml0bWFwCisgICAgICAgIHNpbmNlIHRoZSBjcmFzaCBpbnRlbmRlZWQgdG8gYmUgZml4ZWQgaW4g cjI0NzEzNCBpcyBzdGlsbCBoYXBwZW5pbmcuCisKKyAgICAgICAgKiBTaGFyZWQvY2cvU2hhcmVh YmxlQml0bWFwQ0cuY3BwOgorICAgICAgICAoV2ViS2l0OjpTaGFyZWFibGVCaXRtYXA6Om1ha2VD R0ltYWdlQ29weSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2Vi RHJhZ0NsaWVudE1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6Y29udmVydEltYWdlVG9CaXRtYXAp OgorICAgICAgICAoV2ViS2l0Ojpjb252ZXJ0Q0dJbWFnZVRvQml0bWFwKToKKwogMjAxOS0wNy0y NiAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIE5hdmlnYXRp b25TT0F1dGhvcml6YXRpb25TZXNzaW9uIHNob3VsZCBjaGVjayB0aGUgYWN0aXZlIFVSTCBvZiB0 aGUgcmVzcG9uZGluZyBwYWdlIGFmdGVyIHdha2luZyB1cCBmcm9tIHdhaXRpbmcKSW5kZXg6IFNv dXJjZS9XZWJLaXQvU2hhcmVkL2NnL1NoYXJlYWJsZUJpdG1hcENHLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9jZy9TaGFyZWFibGVCaXRtYXBDRy5jcHAJKHJldmlzaW9u IDI0Nzg4MikKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL2NnL1NoYXJlYWJsZUJpdG1hcENHLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDYgKzExNCw5IEBAIHZvaWQgU2hhcmVhYmxlQml0bWFw OjpwYWludChXZWJDb3JlOjpHcmEKIFJldGFpblB0cjxDR0ltYWdlUmVmPiBTaGFyZWFibGVCaXRt YXA6Om1ha2VDR0ltYWdlQ29weSgpCiB7CiAgICAgYXV0byBncmFwaGljc0NvbnRleHQgPSBjcmVh dGVHcmFwaGljc0NvbnRleHQoKTsKKyAgICBpZiAoIWdyYXBoaWNzQ29udGV4dCB8fCAhZ3JhcGhp Y3NDb250ZXh0LT5oYXNQbGF0Zm9ybUNvbnRleHQoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisKICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gaW1hZ2UgPSBhZG9wdENGKENHQml0bWFwQ29u dGV4dENyZWF0ZUltYWdlKGdyYXBoaWNzQ29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCkpKTsKICAg ICByZXR1cm4gaW1hZ2U7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJEcmFnQ2xpZW50TWFjLm1tCShy ZXZpc2lvbiAyNDc4ODIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY5LDcgKzY5LDcg QEAgc3RhdGljIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGNvbnZlcnRJbQogICAgICAgICByZXR1 cm4gbnVsbHB0cjsKIAogICAgIGF1dG8gZ3JhcGhpY3NDb250ZXh0ID0gYml0bWFwLT5jcmVhdGVH cmFwaGljc0NvbnRleHQoKTsKLSAgICBpZiAoIWdyYXBoaWNzQ29udGV4dCkKKyAgICBpZiAoIWdy YXBoaWNzQ29udGV4dCB8fCAhZ3JhcGhpY3NDb250ZXh0LT5oYXNQbGF0Zm9ybUNvbnRleHQoKSkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBSZXRhaW5QdHI8TlNHcmFwaGljc0NvbnRl eHQ+IHNhdmVkQ29udGV4dCA9IFtOU0dyYXBoaWNzQ29udGV4dCBjdXJyZW50Q29udGV4dF07CkBA IC0xODQsNiArMTg0LDggQEAgc3RhdGljIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGNvbnZlcnRD RwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIGF1dG8gZ3JhcGhpY3NDb250ZXh0ID0g Yml0bWFwLT5jcmVhdGVHcmFwaGljc0NvbnRleHQoKTsKKyAgICBpZiAoIWdyYXBoaWNzQ29udGV4 dCB8fCAhZ3JhcGhpY3NDb250ZXh0LT5oYXNQbGF0Zm9ybUNvbnRleHQoKSkKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAgICAgVUlHcmFwaGljc1B1c2hDb250ZXh0KGdyYXBoaWNzQ29udGV4dC0+ cGxhdGZvcm1Db250ZXh0KCkpOwogICAgIENHQ29udGV4dERyYXdJbWFnZShncmFwaGljc0NvbnRl eHQtPnBsYXRmb3JtQ29udGV4dCgpLCBDR1JlY3RNYWtlKDAsIDAsIHNpemUud2lkdGgoKSwgc2l6 ZS5oZWlnaHQoKSksIGltYWdlKTsKICAgICBVSUdyYXBoaWNzUG9wQ29udGV4dCgpOwo=