[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#57755: 29.0.50; [PATCH] Fallout 816106b
From: |
dick |
Subject: |
bug#57755: 29.0.50; [PATCH] Fallout 816106b |
Date: |
Mon, 12 Sep 2022 17:16:02 -0400 |
User-agent: |
Gnus/5.14 (Gnus v5.14) Commercial/29.0.50 (gnu/linux) |
Oh right, ming wong32.
>From 644482da6e69c38b75b461c13a9eb404e014ca78 Mon Sep 17 00:00:00 2001
From: dickmao <dick.r.chiang@gmail.com>
Date: Mon, 12 Sep 2022 17:08:09 -0400
Subject: [PATCH] Fallout 816106b
* src/image.c (init_svg_functions, g_clear_error):
Disregard youthful indiscretions Bug#21641.
(svg_load_image): Avoid segfault and double reporting errors.
* test/manual/image-tests.el (image-tests-load-image/svg-too-big,
image-tests-load-image/svg-invalid): Test it.
---
src/image.c | 26 +++++++++++++++++---------
test/manual/image-tests.el | 19 ++++++++++++++++++-
2 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/image.c b/src/image.c
index 549fe30ef7c..87ddb19b37e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -10907,7 +10907,7 @@ DEF_DLL_FN (int, gdk_pixbuf_get_bits_per_sample, (const
GdkPixbuf *));
DEF_DLL_FN (void, g_type_init, (void));
# endif
DEF_DLL_FN (void, g_object_unref, (gpointer));
-DEF_DLL_FN (void, g_clear_error, (GError **));
+DEF_DLL_FN (void, g_error_free, (GError *));
static bool
init_svg_functions (void)
@@ -10967,7 +10967,7 @@ init_svg_functions (void)
LOAD_DLL_FN (gobject, g_type_init);
# endif
LOAD_DLL_FN (gobject, g_object_unref);
- LOAD_DLL_FN (glib, g_clear_error);
+ LOAD_DLL_FN (glib, g_error_free);
return 1;
}
@@ -10983,7 +10983,7 @@ init_svg_functions (void)
# undef gdk_pixbuf_get_pixels
# undef gdk_pixbuf_get_rowstride
# undef gdk_pixbuf_get_width
-# undef g_clear_error
+# undef g_error_free
# undef g_object_unref
# undef g_type_init
# if LIBRSVG_CHECK_VERSION (2, 52, 1)
@@ -11019,7 +11019,7 @@ init_svg_functions (void)
# define gdk_pixbuf_get_pixels fn_gdk_pixbuf_get_pixels
# define gdk_pixbuf_get_rowstride fn_gdk_pixbuf_get_rowstride
# define gdk_pixbuf_get_width fn_gdk_pixbuf_get_width
-# define g_clear_error fn_g_clear_error
+# define g_error_free fn_g_error_free
# define g_object_unref fn_g_object_unref
# if ! GLIB_CHECK_VERSION (2, 36, 0)
# define g_type_init fn_g_type_init
@@ -11353,7 +11353,7 @@ svg_load_image (struct frame *f, struct image *img,
char *contents,
if (! check_image_size (f, width, height))
{
image_size_error ();
- goto rsvg_error;
+ goto done_error;
}
/* We are now done with the unmodified data. */
@@ -11536,9 +11536,21 @@ svg_load_image (struct frame *f, struct image *img,
char *contents,
image_put_x_image (f, img, ximg, 0);
}
+ eassume (err == NULL);
return true;
rsvg_error:
+ if (err == NULL)
+ image_error ("Error parsing SVG image");
+ else
+ {
+ image_error ("Error parsing SVG image: %s",
+ call2 (intern ("string-trim-right"), build_string
(err->message),
+ Qnil));
+ g_error_free (err);
+ }
+
+ done_error:
if (rsvg_handle)
g_object_unref (rsvg_handle);
if (wrapped_contents)
@@ -11547,10 +11559,6 @@ svg_load_image (struct frame *f, struct image *img,
char *contents,
if (css && !STRINGP (lcss))
xfree (css);
#endif
- image_error ("Error parsing SVG image: %s",
- /* The -1 removes an extra newline. */
- make_string (err->message, strlen (err->message) - 1));
- g_clear_error (&err);
return false;
}
diff --git a/test/manual/image-tests.el b/test/manual/image-tests.el
index f867047d08e..76a22c25718 100644
--- a/test/manual/image-tests.el
+++ b/test/manual/image-tests.el
@@ -79,6 +79,21 @@ image-tests-make-load-image-test
(image-tests-make-load-image-test 'xbm)
(image-tests-make-load-image-test 'xpm)
+(ert-deftest image-tests-load-image/svg-too-big ()
+ (with-temp-buffer
+ (let* ((max-image-size 0)
+ (messages-buffer-name (buffer-name (current-buffer)))
+ (img (cdr (assq 'svg image-tests--images)))
+ (file (if (listp img)
+ (plist-get (cdr img) :file)
+ img)))
+ (save-excursion (find-file file))
+ (should (string-match-p "invalid image size" (buffer-string)))
+ ;; no annoying newlines
+ (should-not (string-match-p "^[ \t\n\r]+$" (buffer-string)))
+ ;; no annoying double error reporting
+ (should-not (string-match-p "error parsing" (buffer-string))))))
+
(ert-deftest image-tests-load-image/svg-invalid ()
(with-temp-buffer
(let ((messages-buffer-name (buffer-name (current-buffer))))
@@ -90,7 +105,9 @@ image-tests-load-image/svg-invalid
:type svg)))
(redisplay))
;; librsvg error: "... Start tag expected, '<' not found [3 times]"
- (should (string-match "[Ee]rror.+Start tag expected" (buffer-string))))))
+ (should (string-match-p "[Ee]rror.+Start tag expected" (buffer-string)))
+ ;; no annoying newlines
+ (should-not (string-match-p "^[ \t\n\r]+$" (buffer-string))))))
;;;; image-test-size
--
2.36.1