Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2020-09-18 14:28:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Fri Sep 18 14:28:30 2020 rev:151 rq:834840 version:27.1 Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2020-09-01 20:03:30.420484062 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new.4249/emacs.changes 2020-09-18 14:31:15.075458870 +0200 @@ -1,0 +2,7 @@ +Tue Sep 15 11:30:04 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Add patch emacs-27.1-gif.patch from upstream mailing list to fix + crash on broken gif files +- Correct group of el package as well as provide it as devel packages + +------------------------------------------------------------------- New: ---- emacs-27.1-gif.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.5YeDAq/_old 2020-09-18 14:31:20.667463861 +0200 +++ /var/tmp/diff_new_pack.5YeDAq/_new 2020-09-18 14:31:20.671463864 +0200 @@ -178,6 +178,7 @@ Patch25: emacs-26.1-xft4x11.patch Patch26: emacs-27.1-pdftex.patch Patch27: emacs-27.1-home.patch +Patch28: emacs-27.1-gif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)} @@ -242,8 +243,9 @@ %package -n emacs-el Requires: emacs = %{version}-%{release} +Provides: emacs-devel = %{version}-%{release} Summary: Several Lisp Files for GNU Emacs -Group: Productivity/Text/Editors +Group: Development/Libraries/Other BuildArch: noarch %description -n emacs-el @@ -252,7 +254,7 @@ %package -n emacs-info Summary: Info files for GNU Emacs -Group: Productivity/Text/Editors +Group: Documentation/Other %if 0%{?suse_version} <= 1500 Requires(post): %install_info_prereq Requires(preun): %install_info_prereq @@ -293,6 +295,7 @@ %patch25 -p0 -b .xft %patch26 -p0 -b .fmt %patch27 -p0 -b .home +%patch28 -p1 -b .crash %patch -p0 -b .0 %if %{without tex4pdf} pushd etc/refcards/ ++++++ emacs-27.1-gif.patch ++++++ >>>>> On Tue, 8 Sep 2020 20:38:30 +0700, nnoodle <[email protected]> said: nnoodle> To reproduce: nnoodle> $ echo 'GIF89a;' > bad.gif nnoodle> $ emacs -Q bad.gif nnoodle> The result will be a segmentation fault. This should fix it, can you test it? Thanks Robert diff --git a/src/image.c b/src/image.c index d8c34669cc..6e3b71a869 100644 --- a/src/image.c +++ b/src/image.c @@ -8251,7 +8251,7 @@ gif_load (struct frame *f, struct image *img) Lisp_Object specified_file = image_spec_value (img->spec, QCfile, NULL); Lisp_Object specified_data = image_spec_value (img->spec, QCdata, NULL); EMACS_INT idx; - int gif_err; + int gif_err = 0; if (NILP (specified_data)) { @@ -8277,7 +8277,8 @@ gif_load (struct frame *f, struct image *img) { #if HAVE_GIFERRORSTRING image_error ("Cannot open `%s': %s", - file, build_string (GifErrorString (gif_err))); + file, gif_err ? build_string (GifErrorString (gif_err)) + : build_string ("Unknown error from gif library")); #else image_error ("Cannot open `%s'", file); #endif
