Ladybird: Check for errors while decoding favicons

awesomekling · ADKaster · commit a08e83e2cc27 · 2022-12-25T07:58:58.000-07:00
diff --git a/Ladybird/WebView.cpp b/Ladybird/WebView.cpp
@@ -220,8 +220,13 @@ class HeadlessBrowserPageClient final : public Web::PageClient {
 
     virtual void page_did_change_favicon(Gfx::Bitmap const& bitmap) override
     {
-        QPixmap icon = QPixmap::fromImage(QImage(bitmap.scanline_u8(0), bitmap.width(), bitmap.height(), bitmap.pitch(), QImage::Format_ARGB32));
-        emit m_view.favicon_changed(QIcon(icon));
+        auto qimage = QImage(bitmap.scanline_u8(0), bitmap.width(), bitmap.height(), QImage::Format_ARGB32);
+        if (qimage.isNull())
+            return;
+        auto qpixmap = QPixmap::fromImage(qimage);
+        if (qpixmap.isNull())
+            return;
+        emit m_view.favicon_changed(QIcon(qpixmap));
     }
 
     virtual void page_did_layout() override

Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,13 @@ class HeadlessBrowserPageClient final : public Web::PageClient {`
`220`	`220`
`221`	`221`	`virtual void page_did_change_favicon(Gfx::Bitmap const& bitmap) override`
`222`	`222`	`{`
`223`		`- QPixmap icon = QPixmap::fromImage(QImage(bitmap.scanline_u8(0), bitmap.width(), bitmap.height(), bitmap.pitch(), QImage::Format_ARGB32));`
`224`		`- emit m_view.favicon_changed(QIcon(icon));`
	`223`	`+ auto qimage = QImage(bitmap.scanline_u8(0), bitmap.width(), bitmap.height(), QImage::Format_ARGB32);`
	`224`	`+ if (qimage.isNull())`
	`225`	`+ return;`
	`226`	`+ auto qpixmap = QPixmap::fromImage(qimage);`
	`227`	`+ if (qpixmap.isNull())`
	`228`	`+ return;`
	`229`	`+ emit m_view.favicon_changed(QIcon(qpixmap));`
`225`	`230`	`}`
`226`	`231`
`227`	`232`	`virtual void page_did_layout() override`