Hello community, here is the log from the commit of package gifsicle for openSUSE:Factory checked in at 2018-04-19 15:29:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gifsicle (Old) and /work/SRC/openSUSE:Factory/.gifsicle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gifsicle" Thu Apr 19 15:29:57 2018 rev:9 rq:597416 version:1.91 Changes: -------- --- /work/SRC/openSUSE:Factory/gifsicle/gifsicle.changes 2018-01-09 14:53:07.811979396 +0100 +++ /work/SRC/openSUSE:Factory/.gifsicle.new/gifsicle.changes 2018-04-19 15:30:10.029387083 +0200 @@ -1,0 +2,6 @@ +Mon Apr 16 22:40:09 UTC 2018 - [email protected] + +- add fix_gifdiff_null_pointer_deref.patch: + upstream fix, commit e2d5c01a9c7022003135888c85b3255226e4cf98 + +------------------------------------------------------------------- New: ---- fix_gifdiff_null_pointer_deref.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gifsicle.spec ++++++ --- /var/tmp/diff_new_pack.rM0QgX/_old 2018-04-19 15:30:13.289253416 +0200 +++ /var/tmp/diff_new_pack.rM0QgX/_new 2018-04-19 15:30:13.293253252 +0200 @@ -20,12 +20,15 @@ Version: 1.91 Release: 0 Summary: Creating and editing GIF images and animations -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Graphics/Other -Url: https://www.lcdf.org/gifsicle/ +URL: https://www.lcdf.org/gifsicle/ Source: https://www.lcdf.org/gifsicle/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix_gifdiff_null_pointer_deref.patch +Patch0: fix_gifdiff_null_pointer_deref.patch Obsoletes: ungifsicle < %{version} Provides: ungifsicle = %{version} +BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: perl-Time-HiRes @@ -50,6 +53,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -62,7 +66,8 @@ %make_install %files -%doc COPYING NEWS.md README.md +%license COPYING +%doc NEWS.md README.md %{_bindir}/gifdiff %{_bindir}/gifsicle %{_bindir}/gifview ++++++ fix_gifdiff_null_pointer_deref.patch ++++++ >From e2d5c01a9c7022003135888c85b3255226e4cf98 Mon Sep 17 00:00:00 2001 From: Eddie Kohler <[email protected]> Date: Sun, 8 Apr 2018 15:15:56 -0400 Subject: [PATCH] Fix #130 (gifdiff null pointer deref). --- src/gifdiff.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gifdiff.c b/src/gifdiff.c index ade1e1e..abc0142 100644 --- a/src/gifdiff.c +++ b/src/gifdiff.c @@ -61,9 +61,8 @@ static Clp_Parser* clp; static void combine_colormaps(Gif_Colormap *gfcm, Gif_Colormap *newcm) { - int i; - if (!gfcm) return; - for (i = 0; i < gfcm->ncol; i++) { + int i, gfcm_ncol = gfcm ? gfcm->ncol : 0; + for (i = 0; i < gfcm_ncol; i++) { Gif_Color *c = &gfcm->col[i]; c->pixel = Gif_AddColor(newcm, c, 1); } @@ -116,11 +115,12 @@ apply_image(int is_second, Gif_Stream *gfs, int imageno, uint16_t background) uint16_t *data = gdata[is_second]; uint16_t *last = glast[is_second]; Gif_Colormap *gfcm = gfi->local ? gfi->local : gfs->global; + int gfcm_ncol = gfcm ? gfcm->ncol : 0; /* set up colormap */ - for (i = 0; i < gfcm->ncol; ++i) + for (i = 0; i < gfcm_ncol; ++i) map[i] = gfcm->col[i].pixel; - for (i = gfcm->ncol; i < 256; ++i) + for (i = gfcm_ncol; i < 256; ++i) map[i] = 1; if (gfi->transparent >= 0 && gfi->transparent < 256) map[gfi->transparent] = TRANSP;
