From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 8 Dec 2021 00:38:25 +0000 (+0100)
Subject: Check decoding results in webp_load before using it
X-Git-Tag: emacs-29.0.90~3610^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9c43acdd6286bf51ab561aabe84e3dcd3a30eff;p=emacs.git

Check decoding results in webp_load before using it

* src/image.c (webp_load): Check whether we were able to decode
the image before using it.
---

diff --git a/src/image.c b/src/image.c
index 65bf22b9814..cd0f3f697f8 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9039,6 +9039,12 @@ webp_load (struct frame *f, struct image *img)
     /* Linear [r0, g0, b0, r1, g1, b1, ...] order.  */
     decoded = WebPDecodeRGB (contents, size, &width, &height);
 
+  if (!decoded)
+    {
+      image_error ("Error when interpreting WebP image data");
+      goto webp_error1;
+    }
+
   if (!(width <= INT_MAX && height <= INT_MAX
 	&& check_image_size (f, width, height)))
     {