rpms/netpbm/F-8 netpbm-10.23-security.patch,1.17,1.18

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/netpbm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15759

Modified Files:
	netpbm-10.23-security.patch 
Log Message:
sync security patch with rawhide


netpbm-10.23-security.patch:

Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-8/netpbm-10.23-security.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- netpbm-10.23-security.patch	19 Dec 2006 13:47:12 -0000	1.17
+++ netpbm-10.23-security.patch	31 Mar 2008 13:30:43 -0000	1.18
@@ -1128,20 +1128,6 @@
          *padrightP =
              ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
          *bits_per_itemP = 16;
-@@ -223,9 +226,13 @@
-         *formatP = PGM_TYPE;
-         *visualclassP = StaticGray;
-         *maxvalP = ( 1 << h10P->display_planes ) - 1;
-+        overflow_add(*maxvalP, 1);
-         *colorsP = pnm_allocrow( *maxvalP + 1 );
-         for ( i = 0; i <= *maxvalP; ++i )
-             PNM_ASSIGN1( (*colorsP)[i], i );
-+        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;
 @@ -544,6 +551,7 @@
  
      *colsP = h11FixedP->pixmap_width;