From 336e8a8e29f5638e5de9af9abaecf3cc7da98e32 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 16 Feb 2009 11:28:25 +0000 Subject: [PATCH] - update to 10.35.60 - update .security patch, minor cleanup - fixes xwdtopnm for at least some direct color 24/32 images - fixes memory leak and out of memory crash in libpammap --- .cvsignore | 2 +- netpbm-10.23-security.patch | 43 +++++++++++++++++++------------------ netpbm.spec | 11 ++++++---- sources | 2 +- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.cvsignore b/.cvsignore index f46e7e1..84ea349 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netpbm-10.35.59.tar.bz2 +netpbm-10.35.60.tar.bz2 diff --git a/netpbm-10.23-security.patch b/netpbm-10.23-security.patch index 033b38e..1703bb7 100644 --- a/netpbm-10.23-security.patch +++ b/netpbm-10.23-security.patch @@ -303,27 +303,6 @@ diff -up netpbm-10.35.46/converter/other/tifftopnm.c.security netpbm-10.35.46/co if (samplebuf == NULL) pm_error ("can't allocate memory for row buffer"); -diff -up netpbm-10.35.46/converter/other/xwdtopnm.c.security netpbm-10.35.46/converter/other/xwdtopnm.c ---- netpbm-10.35.46/converter/other/xwdtopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/xwdtopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -214,6 +214,9 @@ processX10Header(X10WDFileHeader * cons - *colorsP = pnm_allocrow( 2 ); - PNM_ASSIGN1( (*colorsP)[0], 0 ); - PNM_ASSIGN1( (*colorsP)[1], *maxvalP ); -+ overflow_add(h10P->pixmap_width, 15); -+ if(h10P->pixmap_width < 0) -+ pm_error("assert: negative width"); - *padrightP = - ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width; - *bits_per_itemP = 16; -@@ -560,6 +563,7 @@ processX11Header(X11WDFileHeader * cons - - *colsP = h11FixedP->pixmap_width; - *rowsP = h11FixedP->pixmap_height; -+ overflow2(h11FixedP->bytes_per_line, 8); - *padrightP = - h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel - - h11FixedP->pixmap_width; diff -up netpbm-10.35.46/converter/pbm/icontopbm.c.security netpbm-10.35.46/converter/pbm/icontopbm.c --- netpbm-10.35.46/converter/pbm/icontopbm.c.security 2008-06-24 08:59:23.000000000 +0200 +++ netpbm-10.35.46/converter/pbm/icontopbm.c 2008-06-24 09:04:21.000000000 +0200 @@ -2098,3 +2077,25 @@ diff -up netpbm-10.35.46/urt/scanargs.c.security netpbm-10.35.46/urt/scanargs.c #if defined(c_plusplus) && !defined(USE_PROTOTYPES) #define USE_PROTOTYPES +diff -up netpbm-10.35.60/converter/other/xwdtopnm.c.security netpbm-10.35.60/converter/other/xwdtopnm.c +--- netpbm-10.35.60/converter/other/xwdtopnm.c.security 2009-02-15 13:04:43.000000000 +0100 ++++ netpbm-10.35.60/converter/other/xwdtopnm.c 2009-02-16 12:15:50.000000000 +0100 +@@ -214,6 +214,10 @@ processX10Header(X10WDFileHeader * cons + *colorsP = pnm_allocrow( 2 ); + PNM_ASSIGN1( (*colorsP)[0], 0 ); + PNM_ASSIGN1( (*colorsP)[1], *maxvalP ); ++ overflow_add(h10P->pixmap_width, 15); ++ if(h10P->pixmap_width < 0) ++ pm_error("assert: negative width"); ++ overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8); + *padrightP = + (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8; + *bits_per_itemP = 16; +@@ -608,6 +612,7 @@ processX11Header(X11WDFileHeader * cons + + *colsP = h11FixedP->pixmap_width; + *rowsP = h11FixedP->pixmap_height; ++ overflow2(h11FixedP->bytes_per_line, 8); + *padrightP = + h11FixedP->bytes_per_line * 8 - + h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; diff --git a/netpbm.spec b/netpbm.spec index 418c493..70958db 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,6 +1,6 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.35.59 +Version: 10.35.60 Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain @@ -101,9 +101,6 @@ netpbm-progs. You'll also need to install the netpbm package. %patch24 -p1 -b .64bitfix %patch25 -p1 -b .ximtoppmsegfault -##mv shhopt/shhopt.h shhopt/pbmshhopt.h -##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile - %build ./configure < 10.35.60-1 +- update to 10.35.60 +- update .security patch, minor cleanup +- fixes xwdtopnm for at least some direct color 24/32 images +- fixes memory leak and out of memory crash in libpammap + * Thu Jan 29 2009 Jindrich Novy 10.35.59-1 - update to 10.35.59 - fixes array bound violation in ilbmtoppm diff --git a/sources b/sources index 364e463..ebb0fe3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77aeea6898f28757c5ab0a4ae65f4d5b netpbm-10.35.59.tar.bz2 +0d3e23ff20836c0fb8e8365284567296 netpbm-10.35.60.tar.bz2