From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 31 Oct 2020 23:10:21 +0000 (+0100)
Subject: Fix a segfault in the new svg code
X-Git-Tag: emacs-28.0.90~5302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9405cd84a6309f780e76c11a4c79709aa8a4f44f;p=emacs.git

Fix a segfault in the new svg code

* src/image.c (svg_load_image): Don't pass in a NULL for the
logical rect, because that will sometimes segfault.
---

diff --git a/src/image.c b/src/image.c
index 61c5aa760c7..c857b8e62a4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9808,11 +9808,11 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
 
   /* Get the image dimensions.  */
 #if LIBRSVG_CHECK_VERSION (2, 46, 0)
-  RsvgRectangle zero_rect, viewbox;
+  RsvgRectangle zero_rect, viewbox, out_logical_rect;
 
   rsvg_handle_get_geometry_for_layer (rsvg_handle, NULL,
                                       &zero_rect, &viewbox,
-                                      NULL, NULL);
+                                      &out_logical_rect, NULL);
   viewbox_width = viewbox.x + viewbox.width;
   viewbox_height = viewbox.y + viewbox.height;
 #else