diff --git a/netpbm-10.27-bmptopnm.patch b/netpbm-10.27-bmptopnm.patch index ccc3317..771a112 100644 --- a/netpbm-10.27-bmptopnm.patch +++ b/netpbm-10.27-bmptopnm.patch @@ -1,6 +1,6 @@ ---- netpbm-10.32/converter/other/bmptopnm.c.bmptopnm 2006-02-27 15:02:02.000000000 +0100 -+++ netpbm-10.32/converter/other/bmptopnm.c 2006-02-27 15:07:31.000000000 +0100 -@@ -1248,7 +1248,7 @@ readBmp(FILE * const ifP, +--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100 ++++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100 +@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP, xel ** const colormapP, bool const verbose) { @@ -9,12 +9,11 @@ unsigned int pos; /* Current byte position in the BMP file */ -@@ -1455,7 +1455,7 @@ main(int argc, char ** argv) { - writeRasterGen(BMPraster, cols, rows, outputType, cBitCount, - pixelformat, colormap); +@@ -1278,7 +1278,6 @@ readBmp(FILE * const ifP, + BMPreadfileheader(ifP, &bytesRead, &offBits); + pos += bytesRead; } -- free(colormap); -+ if (colormap) free(colormap); - free(BMPraster); - - return 0; +- if(BMPheader.cmapsize != 0) + { + unsigned int bytesRead; + BMPreadinfoheader(ifP, &bytesRead, &BMPheader); diff --git a/netpbm.spec b/netpbm.spec index a98ef1b..ee3977f 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats. Name: netpbm Version: 10.35 -Release: 9%{?dist} +Release: 10%{?dist} License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template %{_mandir}/man5/* %changelog +* Mon Jan 29 2006 Jindrich Novy 10.35-10 +- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) + * Thu Dec 28 2006 Jindrich Novy 10.35-9 - pbmtog3 won't segfault on 64bit arches (#220739)