rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix ppmdither leak caused by bug in security patch (#157757)

Browse Source 
- drop gcc34 patch
This commit is contained in:
Jindrich Novy 2005-05-16 09:27:12 +00:00
parent 751dd227b9
commit 7552ecf308
2 changed files with 142 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
netpbm-10.23-security.patch
View File

@ -1,5 +1,5 @@
--- netpbm-10.27/generator/ppmrainbow.security 2003-01-04 01:40:56.000000000 +0100
+++ netpbm-10.27/generator/ppmrainbow 2005-03-29 14:31:42.980576704 +0200
+++ netpbm-10.27/generator/ppmrainbow 2005-05-16 11:12:43.993388752 +0200
@@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v
# set defaults
$Twid = 600;
@ -10,7 +10,7 @@
$verbose = $FALSE;
--- netpbm-10.27/generator/pbmpage.c.security 2003-07-09 20:48:11.000000000 +0200
+++ netpbm-10.27/generator/pbmpage.c 2005-03-29 14:31:42.981576552 +0200
+++ netpbm-10.27/generator/pbmpage.c 2005-05-16 11:12:43.994388600 +0200
@@ -15,6 +15,7 @@
#include <math.h>
#include <stdio.h>
@ -30,7 +30,7 @@
bitmap_cursor = 0;
--- netpbm-10.27/generator/pbmtext.c.security 2004-12-08 05:56:06.000000000 +0100
+++ netpbm-10.27/generator/pbmtext.c 2005-03-29 14:31:42.982576400 +0200
+++ netpbm-10.27/generator/pbmtext.c 2005-05-16 11:12:43.996388296 +0200
@@ -89,12 +89,14 @@ parse_command_line(int argc, char ** arg
for (i = 1; i < argc; i++) {
@ -94,7 +94,7 @@
/* Fill background with white */
--- netpbm-10.27/generator/pgmcrater.c.security 2003-07-06 22:02:41.000000000 +0200
+++ netpbm-10.27/generator/pgmcrater.c 2005-03-29 14:31:42.983576248 +0200
+++ netpbm-10.27/generator/pgmcrater.c 2005-05-16 11:12:43.997388144 +0200
@@ -131,7 +131,7 @@ static void gencraters()
/* Acquire the elevation array and initialise it to mean
surface elevation. */
@ -105,7 +105,7 @@
pm_error("out of memory allocating elevation array");
--- netpbm-10.27/generator/pgmkernel.c.security 2003-07-06 22:03:29.000000000 +0200
+++ netpbm-10.27/generator/pgmkernel.c 2005-03-29 14:31:42.984576096 +0200
+++ netpbm-10.27/generator/pgmkernel.c 2005-05-16 11:12:43.998387992 +0200
@@ -68,7 +68,7 @@ main ( argc, argv )
kycenter = (fysize - 1) / 2.0;
ixsize = fxsize + 0.999;
@ -116,7 +116,7 @@
for (j = 0; j < ixsize; j++) {
fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
--- netpbm-10.27/converter/other/pbmtopgm.c.security 2004-09-18 05:15:02.000000000 +0200
+++ netpbm-10.27/converter/other/pbmtopgm.c 2005-03-29 14:31:42.985575944 +0200
+++ netpbm-10.27/converter/other/pbmtopgm.c 2005-05-16 11:12:43.999387840 +0200
@@ -45,6 +45,7 @@ main(int argc, char *argv[]) {
"than the image height (%u rows)", height, rows);
@ -126,7 +126,7 @@
pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
--- netpbm-10.27/converter/other/sirtopnm.c.security 2002-01-04 18:22:45.000000000 +0100
+++ netpbm-10.27/converter/other/sirtopnm.c 2005-03-29 14:31:42.986575792 +0200
+++ netpbm-10.27/converter/other/sirtopnm.c 2005-05-16 11:12:44.000387688 +0200
@@ -69,6 +69,7 @@ char* argv[];
}
break;
@ -136,7 +136,7 @@
planesize = cols * rows;
if ( !( sirarray = (unsigned char*) malloc( picsize ) ) )
--- netpbm-10.27/converter/other/sgitopnm.c.security 2003-07-10 05:42:28.000000000 +0200
+++ netpbm-10.27/converter/other/sgitopnm.c 2005-03-29 14:31:42.987575640 +0200
+++ netpbm-10.27/converter/other/sgitopnm.c 2005-05-16 11:12:44.001387536 +0200
@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
if (ochan < 0) {
@ -157,7 +157,7 @@
for( channel = 0; channel < maxchannel; channel++ ) {
#ifdef DEBUG
--- netpbm-10.27/converter/other/pnmtosgi.c.security 2003-07-10 06:04:07.000000000 +0200
+++ netpbm-10.27/converter/other/pnmtosgi.c 2005-03-29 14:31:42.988575488 +0200
+++ netpbm-10.27/converter/other/pnmtosgi.c 2005-05-16 11:12:44.002387384 +0200
@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
}
}
@ -199,7 +199,7 @@
channel[chan_no][row].length = len;
MALLOCARRAY(p, len);
--- netpbm-10.27/converter/other/tifftopnm.c.security 2005-03-28 01:32:05.000000000 +0200
+++ netpbm-10.27/converter/other/tifftopnm.c 2005-03-29 14:31:42.990575184 +0200
+++ netpbm-10.27/converter/other/tifftopnm.c 2005-05-16 11:12:44.004387080 +0200
@@ -742,7 +742,8 @@ convertRasterByRows(FILE * const
if (scanbuf == NULL)
pm_error("can't allocate memory for scanline buffer");
@ -211,7 +211,7 @@
pm_error ("can't allocate memory for row buffer");
--- netpbm-10.27/converter/other/pnmtorle.c.security 2003-07-10 06:04:49.000000000 +0200
+++ netpbm-10.27/converter/other/pnmtorle.c 2005-03-29 14:31:42.992574880 +0200
+++ netpbm-10.27/converter/other/pnmtorle.c 2005-05-16 11:12:44.005386928 +0200
@@ -19,6 +19,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -222,7 +222,7 @@
/*
* pnmtorle - A program which will convert pbmplus (ppm or pgm) images
--- netpbm-10.27/converter/other/jpegtopnm.c.security 2004-10-26 06:20:07.000000000 +0200
+++ netpbm-10.27/converter/other/jpegtopnm.c 2005-03-29 14:31:42.993574728 +0200
+++ netpbm-10.27/converter/other/jpegtopnm.c 2005-05-16 11:12:44.007386624 +0200
@@ -828,6 +828,7 @@ convertImage(FILE *
/* Calculate output image dimensions so we can allocate space */
jpeg_calc_output_dimensions(cinfoP);
@ -232,7 +232,7 @@
((j_common_ptr) cinfoP, JPOOL_IMAGE,
cinfoP->output_width * cinfoP->output_components,
--- netpbm-10.27/converter/other/rletopnm.c.security 2004-10-19 17:36:22.000000000 +0200
+++ netpbm-10.27/converter/other/rletopnm.c 2005-03-29 14:31:42.995574424 +0200
+++ netpbm-10.27/converter/other/rletopnm.c 2005-05-16 11:12:44.009386320 +0200
@@ -19,6 +19,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -243,7 +243,7 @@
/*
* rletopnm - A conversion program to convert from Utah's "rle" image format
--- netpbm-10.27/converter/other/pnmtotiff.c.security 2005-03-28 01:16:55.000000000 +0200
+++ netpbm-10.27/converter/other/pnmtotiff.c 2005-03-29 14:31:42.996574272 +0200
+++ netpbm-10.27/converter/other/pnmtotiff.c 2005-05-16 11:12:44.010386168 +0200
@@ -620,11 +620,14 @@ computeRasterParm(int const
if (*bitspersampleP < 8) {
int samplesperbyte;
@ -262,7 +262,7 @@
*rowsperstripP = (8 * 1024) / *bytesperrowP;
else
--- netpbm-10.27/converter/other/pnmtopalm/palmcolormap.c.security 2004-10-16 19:50:24.000000000 +0200
+++ netpbm-10.27/converter/other/pnmtopalm/palmcolormap.c 2005-03-29 14:31:42.998573968 +0200
+++ netpbm-10.27/converter/other/pnmtopalm/palmcolormap.c 2005-05-16 11:12:44.011386016 +0200
@@ -232,7 +232,7 @@ Colormap
return 0;
@ -273,7 +273,7 @@
colormap->ncolors = ncolors;
--- netpbm-10.27/converter/other/pngtopnm.c.security 2005-03-25 06:08:44.000000000 +0100
+++ netpbm-10.27/converter/other/pngtopnm.c 2005-03-29 14:31:42.999573816 +0200
+++ netpbm-10.27/converter/other/pngtopnm.c 2005-05-16 11:12:44.012385864 +0200
@@ -744,18 +744,30 @@ convertpng (FILE * const ifp
}
@ -306,7 +306,7 @@
for (y = 0 ; y < info_ptr->height ; y++) {
png_image[y] = malloc (linesize);
--- netpbm-10.27/converter/other/gemtopnm.c.security 2004-09-18 05:15:23.000000000 +0200
+++ netpbm-10.27/converter/other/gemtopnm.c 2005-03-29 14:31:43.001573512 +0200
+++ netpbm-10.27/converter/other/gemtopnm.c 2005-05-16 11:12:44.014385560 +0200
@@ -106,6 +106,7 @@ main(argc, argv)
pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
@ -315,8 +315,8 @@
{
/* allocate input row data structure */
int plane;
--- netpbm-10.27/converter/other/pnmtojpeg.c.security 2005-03-29 14:31:42.974577616 +0200
+++ netpbm-10.27/converter/other/pnmtojpeg.c 2005-03-29 14:31:43.002573360 +0200
--- netpbm-10.27/converter/other/pnmtojpeg.c.security 2004-07-17 06:05:54.000000000 +0200
+++ netpbm-10.27/converter/other/pnmtojpeg.c 2005-05-16 11:14:55.119454560 +0200
@@ -588,6 +588,8 @@ compute_rescaling_array(JSAMPLE ** const
const long half_maxval = maxval / 2;
long val;
@ -338,17 +338,17 @@
* want JPOOL_PERMANENT.
*/
const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
- const jpeg_scan_info * scan_info =
- jpeg_scan_info * const scan_info =
+ const jpeg_scan_info * scan_info;
+
+ overflow2(nscans, sizeof(jpeg_scan_info));
+
+ scan_info =
+ scan_info =
(jpeg_scan_info *)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
scan_info_size);
--- netpbm-10.27/converter/other/pnmtops.c.security 2005-01-06 02:04:39.000000000 +0100
+++ netpbm-10.27/converter/other/pnmtops.c 2005-03-29 14:41:36.063414408 +0200
+++ netpbm-10.27/converter/other/pnmtops.c 2005-05-16 11:12:44.017385104 +0200
@@ -187,16 +187,21 @@ parseCommandLine(int argc, char ** argv,
cmdlineP->canturn = !noturn;
cmdlineP->showpage = !noshowpage;
@ -375,7 +375,7 @@
if (!cmdlineP->psfilter &&
--- netpbm-10.27/converter/other/xwdtopnm.c.security 2005-01-02 19:36:02.000000000 +0100
+++ netpbm-10.27/converter/other/xwdtopnm.c 2005-03-29 14:31:43.007572600 +0200
+++ netpbm-10.27/converter/other/xwdtopnm.c 2005-05-16 11:12:44.019384800 +0200
@@ -247,6 +247,9 @@ processX10Header(X10WDFileHeader * cons
*colorsP = pnm_allocrow( 2 );
PNM_ASSIGN1( (*colorsP)[0], 0 );
@ -409,7 +409,7 @@
h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel -
h11FixedP->pixmap_width;
--- netpbm-10.27/converter/other/pnmtoddif.c.security 2002-07-30 19:09:13.000000000 +0200
+++ netpbm-10.27/converter/other/pnmtoddif.c 2005-03-29 14:31:43.008572448 +0200
+++ netpbm-10.27/converter/other/pnmtoddif.c 2005-05-16 11:12:44.021384496 +0200
@@ -484,6 +484,7 @@ int main(int argc, char *argv[])
switch (PNM_FORMAT_TYPE(format)) {
case PBM_TYPE:
@ -427,7 +427,7 @@
ip.bits_per_pixel = 24;
ip.spectral = 5;
--- netpbm-10.27/converter/ppm/ppmtomitsu.c.security 2003-07-06 23:04:25.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtomitsu.c 2005-03-29 14:31:43.010572144 +0200
+++ netpbm-10.27/converter/ppm/ppmtomitsu.c 2005-05-16 11:12:44.022384344 +0200
@@ -164,6 +164,8 @@ int main( argc, argv )
medias = MSize_User;
@ -438,7 +438,7 @@
medias.maxrows *= 2;
}
--- netpbm-10.27/converter/ppm/ppmtompeg/psearch.c.security 2002-10-14 04:22:16.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/psearch.c 2005-03-29 14:31:43.011571992 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/psearch.c 2005-05-16 11:12:44.024384040 +0200
@@ -217,7 +217,14 @@ SetSearchRange(int const pixelsP, int co
int const max_search = max(searchRangeP, searchRangeB);
@ -485,8 +485,8 @@
columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
#ifdef COMPLETE_DISPLAY
--- netpbm-10.27/converter/ppm/ppmtompeg/parallel.c.security 2005-03-29 14:31:42.959579896 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/parallel.c 2005-03-29 14:31:43.014571536 +0200
--- netpbm-10.27/converter/ppm/ppmtompeg/parallel.c.security 2005-05-16 11:12:43.978391032 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/parallel.c 2005-05-16 11:12:44.026383736 +0200
@@ -2124,7 +2124,9 @@ DecodeServer(int const numInput
const char * error;
@ -499,7 +499,7 @@
waitMachine = (int *) calloc(numInputFiles, sizeof(int));
waitPort = (int *) malloc(numMachines*sizeof(int));
--- netpbm-10.27/converter/ppm/ppmtompeg/jpeg.c.security 2002-10-17 16:49:49.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/jpeg.c 2005-03-29 14:31:43.015571384 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/jpeg.c 2005-05-16 11:12:44.027383584 +0200
@@ -228,7 +228,7 @@ int end; /* last frame to
exit(1);
}
@ -510,7 +510,7 @@
if (fread (&(width),sizeof(int),1,inFile) != 1)
{
--- netpbm-10.27/converter/ppm/ppmtompeg/rgbtoycc.c.security 2004-11-13 23:13:03.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtompeg/rgbtoycc.c 2005-03-29 14:31:43.016571232 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/rgbtoycc.c 2005-05-16 11:12:44.027383584 +0200
@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
}
table_maxval = maxval;
@ -521,7 +521,7 @@
mult587 = malloc((table_maxval+1)*sizeof(float));
mult114 = malloc((table_maxval+1)*sizeof(float));
--- netpbm-10.27/converter/ppm/ppmtompeg/frame.c.security 2004-11-27 00:44:01.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtompeg/frame.c 2005-03-29 14:31:43.018570928 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/frame.c 2005-05-16 11:12:44.029383280 +0200
@@ -137,24 +137,24 @@ int i;
omfrw->orig_y = NULL;
Fsize_x = out_x;
@ -703,7 +703,7 @@
}
--- netpbm-10.27/converter/ppm/ppmtompeg/iframe.c.security 2004-11-27 04:58:15.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtompeg/iframe.c 2005-03-29 14:31:43.020570624 +0200
+++ netpbm-10.27/converter/ppm/ppmtompeg/iframe.c 2005-05-16 11:12:44.030383128 +0200
@@ -859,6 +859,7 @@ BlockComputeSNR(current, snr, psnr)
int ysz = (Fsize_y>>3) * sizeof(int32 *);
int xsz = (Fsize_x>>3);
@ -757,7 +757,7 @@
ERRCHK(dctb[i], "malloc");
}
--- netpbm-10.27/converter/ppm/ppmtowinicon.c.security 2004-05-01 21:00:55.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtowinicon.c 2005-03-29 14:31:43.022570320 +0200
+++ netpbm-10.27/converter/ppm/ppmtowinicon.c 2005-05-16 11:12:44.031382976 +0200
@@ -12,6 +12,7 @@
#include <math.h>
@ -817,7 +817,7 @@
}
--- netpbm-10.27/converter/ppm/ppmtolj.c.security 2002-09-06 18:31:57.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtolj.c 2005-03-29 14:31:43.023570168 +0200
+++ netpbm-10.27/converter/ppm/ppmtolj.c 2005-05-16 11:12:44.031382976 +0200
@@ -182,6 +182,7 @@ int main(int argc, char *argv[]) {
pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
@ -826,9 +826,9 @@
obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
if (mode == C_TRANS_MODE_DELTA)
--- netpbm-10.27/converter/ppm/Makefile.security 2004-10-16 20:55:28.000000000 +0200
+++ netpbm-10.27/converter/ppm/Makefile 2005-03-29 14:31:43.024570016 +0200
@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
--- netpbm-10.27/converter/ppm/Makefile.security 2005-03-29 15:56:57.000000000 +0200
+++ netpbm-10.27/converter/ppm/Makefile 2005-05-16 11:12:44.032382824 +0200
@@ -11,7 +11,7 @@ SUBDIRS = ppmtompeg
PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
leaftoppm mtvtoppm neotoppm \
@ -838,7 +838,7 @@
ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
--- netpbm-10.27/converter/ppm/ximtoppm.c.security 2004-10-19 17:35:17.000000000 +0200
+++ netpbm-10.27/converter/ppm/ximtoppm.c 2005-03-29 14:31:43.025569864 +0200
+++ netpbm-10.27/converter/ppm/ximtoppm.c 2005-05-16 11:12:44.033382672 +0200
@@ -283,6 +283,7 @@ ReadXimHeader(in_fp, header)
header->bits_channel = atoi(a_head.bits_per_channel);
header->alpha_flag = atoi(a_head.alpha_channel);
@ -872,7 +872,7 @@
sizeof(Color));
if (header->colors == NULL) {
--- netpbm-10.27/converter/ppm/picttoppm.c.security 2005-02-20 22:36:52.000000000 +0100
+++ netpbm-10.27/converter/ppm/picttoppm.c 2005-03-29 14:31:43.027569560 +0200
+++ netpbm-10.27/converter/ppm/picttoppm.c 2005-05-16 11:12:44.035382368 +0200
@@ -1,3 +1,5 @@
+#error "Unfixable. Don't ship me"
+
@ -880,7 +880,7 @@
* picttoppm.c -- convert a MacIntosh PICT file to PPM format.
*
--- netpbm-10.27/converter/ppm/pjtoppm.c.security 2003-07-06 23:45:36.000000000 +0200
+++ netpbm-10.27/converter/ppm/pjtoppm.c 2005-03-29 14:31:43.028569408 +0200
+++ netpbm-10.27/converter/ppm/pjtoppm.c 2005-05-16 11:12:44.035382368 +0200
@@ -127,19 +127,21 @@ main(argc, argv)
case 'V': /* send plane */
case 'W': /* send last plane */
@ -931,7 +931,7 @@
}
--- netpbm-10.27/converter/ppm/sldtoppm.c.security 2004-02-21 22:55:39.000000000 +0100
+++ netpbm-10.27/converter/ppm/sldtoppm.c 2005-03-29 14:31:43.030569104 +0200
+++ netpbm-10.27/converter/ppm/sldtoppm.c 2005-05-16 11:12:44.036382216 +0200
@@ -306,7 +306,9 @@ static void slider(slvec, slflood)
}
@ -944,7 +944,7 @@
PPM_ASSIGN(rgbcolour, 0, 0, 0);
ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
--- netpbm-10.27/converter/ppm/ppmtopj.c.security 2002-09-06 18:32:14.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtopj.c 2005-03-29 14:31:43.031568952 +0200
+++ netpbm-10.27/converter/ppm/ppmtopj.c 2005-05-16 11:12:44.037382064 +0200
@@ -180,6 +180,7 @@ char *argv[];
pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
@ -954,7 +954,7 @@
cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
--- netpbm-10.27/converter/ppm/ppmtoilbm.c.security 2004-03-20 06:06:39.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtoilbm.c 2005-03-29 14:31:43.034568496 +0200
+++ netpbm-10.27/converter/ppm/ppmtoilbm.c 2005-05-16 11:12:44.039381760 +0200
@@ -810,11 +810,15 @@ main(argc, argv)
if( mode != MODE_CMAP ) {
@ -1019,7 +1019,7 @@
for(i = 0; i <= oldmaxval; i++ )
table[i] = (i * newmaxval + oldmaxval/2) / oldmaxval;
--- netpbm-10.27/converter/ppm/xpmtoppm.c.security 2004-03-13 20:36:36.000000000 +0100
+++ netpbm-10.27/converter/ppm/xpmtoppm.c 2005-03-29 14:31:43.035568344 +0200
+++ netpbm-10.27/converter/ppm/xpmtoppm.c 2005-05-16 11:12:44.040381608 +0200
@@ -685,6 +685,7 @@ ReadXPMFile(FILE * const stream, int * c
&ncolors, colorsP, &ptab);
*transparentP = -1; /* No transparency in version 1 */
@ -1029,7 +1029,7 @@
MALLOCARRAY(*dataP, totalpixels);
if (*dataP == NULL)
--- netpbm-10.27/converter/ppm/ilbmtoppm.c.security 2003-08-10 00:30:10.000000000 +0200
+++ netpbm-10.27/converter/ppm/ilbmtoppm.c 2005-03-29 14:31:43.038567888 +0200
+++ netpbm-10.27/converter/ppm/ilbmtoppm.c 2005-05-16 11:12:44.041381456 +0200
@@ -580,6 +580,7 @@ decode_row(ifp, chunksizeP, chunkyrow, n
rawtype *chp;
@ -1117,7 +1117,7 @@
*viewportmodesP |= fakeviewport; /* -isham/-isehb */
--- netpbm-10.27/converter/ppm/ppmtoeyuv.c.security 2003-07-07 00:22:35.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtoeyuv.c 2005-03-29 14:31:43.040567584 +0200
+++ netpbm-10.27/converter/ppm/ppmtoeyuv.c 2005-05-16 11:12:44.042381304 +0200
@@ -113,6 +113,7 @@ create_multiplication_tables(const pixva
int index;
@ -1127,7 +1127,7 @@
MALLOCARRAY_NOFAIL(mult587 , maxval+1);
MALLOCARRAY_NOFAIL(mult114 , maxval+1);
--- netpbm-10.27/converter/ppm/ppmtoicr.c.security 2003-02-22 23:05:03.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtoicr.c 2005-03-29 14:31:43.041567432 +0200
+++ netpbm-10.27/converter/ppm/ppmtoicr.c 2005-05-16 11:12:44.043381152 +0200
@@ -169,7 +169,7 @@ char* argv[];
if (rleflag) {
@ -1138,7 +1138,7 @@
for (i=0; i<rows; i++)
for (j=0; j<cols; j++)
--- netpbm-10.27/converter/ppm/imgtoppm.c.security 2002-09-06 18:30:03.000000000 +0200
+++ netpbm-10.27/converter/ppm/imgtoppm.c 2005-03-29 14:31:43.042567280 +0200
+++ netpbm-10.27/converter/ppm/imgtoppm.c 2005-05-16 11:12:44.044381000 +0200
@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
len = atoi((char*) buf );
if ( fread( buf, len, 1, ifp ) != 1 )
@ -1156,7 +1156,7 @@
pm_message(
"pixel data length (%d) does not match image size (%d)",
--- netpbm-10.27/converter/ppm/pcxtoppm.c.security 2004-04-19 23:30:42.000000000 +0200
+++ netpbm-10.27/converter/ppm/pcxtoppm.c 2005-03-29 14:31:43.043567128 +0200
+++ netpbm-10.27/converter/ppm/pcxtoppm.c 2005-05-16 11:12:44.045380848 +0200
@@ -376,6 +376,7 @@ pcx_16col_to_ppm(ifp, cols, rows, BytesP
}
@ -1183,7 +1183,7 @@
p = pixels;
while (--npixels >= 0)
--- netpbm-10.27/converter/ppm/ppmtopjxl.c.security 2003-02-22 23:04:36.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtopjxl.c 2005-03-29 14:31:43.044566976 +0200
+++ netpbm-10.27/converter/ppm/ppmtopjxl.c 2005-05-16 11:12:44.045380848 +0200
@@ -273,6 +273,8 @@ main(argc, argv)
pm_error("image too large; reduce with ppmscale");
if (maxval > PCL_MAXVAL)
@ -1217,7 +1217,7 @@
(outrow = (char *)malloc((unsigned)bpp*2)) == NULL ||
(runcnt = (signed char *)malloc((unsigned)bpp)) == NULL)
--- netpbm-10.27/converter/ppm/ppmtopict.c.security 2003-02-22 23:04:40.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtopict.c 2005-03-29 14:31:43.045566824 +0200
+++ netpbm-10.27/converter/ppm/ppmtopict.c 2005-05-16 11:12:44.046380696 +0200
@@ -245,6 +245,8 @@ char *argv[];
putShort(stdout, 0); /* mode */
@ -1228,7 +1228,7 @@
oc = 0;
for (row = 0; row < rows; row++)
--- netpbm-10.27/converter/ppm/qrttoppm.c.security 1993-10-04 10:12:56.000000000 +0100
+++ netpbm-10.27/converter/ppm/qrttoppm.c 2005-03-29 14:31:43.046566672 +0200
+++ netpbm-10.27/converter/ppm/qrttoppm.c 2005-05-16 11:12:44.047380544 +0200
@@ -46,7 +46,7 @@ main( argc, argv )
ppm_writeppminit( stdout, cols, rows, maxval, 0 );
@ -1239,7 +1239,7 @@
pm_error( "out of memory" );
--- netpbm-10.27/converter/ppm/ppmtoxpm.c.security 2005-03-17 20:19:45.000000000 +0100
+++ netpbm-10.27/converter/ppm/ppmtoxpm.c 2005-03-29 14:39:29.902593768 +0200
+++ netpbm-10.27/converter/ppm/ppmtoxpm.c 2005-05-16 11:12:44.048380392 +0200
@@ -193,6 +193,7 @@ genNumstr(unsigned int const input, int
unsigned int i;
@ -1257,7 +1257,7 @@
if (cmapP == NULL)
pm_error("Out of memory allocating %u bytes for a color map.",
--- netpbm-10.27/converter/ppm/yuvtoppm.c.security 2003-07-06 22:32:09.000000000 +0200
+++ netpbm-10.27/converter/ppm/yuvtoppm.c 2005-03-29 14:31:43.048566368 +0200
+++ netpbm-10.27/converter/ppm/yuvtoppm.c 2005-05-16 11:12:44.048380392 +0200
@@ -72,6 +72,7 @@ main(argc, argv)
ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
@ -1267,7 +1267,7 @@
if (yuvbuf == NULL)
pm_error("Unable to allocate YUV buffer for %d columns.", cols);
--- netpbm-10.27/converter/ppm/ppmtopcx.c.security 2004-08-31 05:21:55.000000000 +0200
+++ netpbm-10.27/converter/ppm/ppmtopcx.c 2005-03-29 14:31:43.049566216 +0200
+++ netpbm-10.27/converter/ppm/ppmtopcx.c 2005-05-16 11:12:44.049380240 +0200
@@ -418,6 +418,8 @@ ppmTo16ColorPcx(pixel ** cons
else Planes = 1;
}
@ -1278,7 +1278,7 @@
MALLOCARRAY_NOFAIL(indexRow, cols);
MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
--- netpbm-10.27/converter/pgm/psidtopgm.c.security 2002-07-30 17:57:36.000000000 +0200
+++ netpbm-10.27/converter/pgm/psidtopgm.c 2005-03-29 14:31:43.050566064 +0200
+++ netpbm-10.27/converter/pgm/psidtopgm.c 2005-05-16 11:12:44.050380088 +0200
@@ -60,6 +60,7 @@ char* argv[];
"bits/sample (%d) is too large.", bitspersample );
@ -1288,7 +1288,7 @@
for ( row = 0; row < rows; ++row)
{
--- netpbm-10.27/converter/pgm/lispmtopgm.c.security 2002-09-06 18:27:00.000000000 +0200
+++ netpbm-10.27/converter/pgm/lispmtopgm.c 2005-03-29 14:31:43.051565912 +0200
+++ netpbm-10.27/converter/pgm/lispmtopgm.c 2005-05-16 11:12:44.051379936 +0200
@@ -57,6 +57,7 @@ main( argc, argv )
pm_error( "depth (%d bits) is too large", depth);
@ -1309,7 +1309,7 @@
if ( *colsP != (cols_32 - *padrightP) ) {
--- netpbm-10.27/converter/pbm/pbmtozinc.c.security 2002-07-30 17:47:45.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtozinc.c 2005-03-29 14:31:43.051565912 +0200
+++ netpbm-10.27/converter/pbm/pbmtozinc.c 2005-05-16 11:12:44.051379936 +0200
@@ -66,6 +66,7 @@ main( argc, argv )
bitrow = pbm_allocrow( cols );
@ -1319,7 +1319,7 @@
printf( "USHORT %s[] = {\n",name);
--- netpbm-10.27/converter/pbm/pbmtomgr.c.security 1993-10-04 10:10:50.000000000 +0100
+++ netpbm-10.27/converter/pbm/pbmtomgr.c 2005-03-29 14:31:43.052565760 +0200
+++ netpbm-10.27/converter/pbm/pbmtomgr.c 2005-05-16 11:12:44.052379784 +0200
@@ -43,6 +43,7 @@ main( argc, argv )
bitrow = pbm_allocrow( cols );
@ -1329,7 +1329,7 @@
putinit( rows, cols );
--- netpbm-10.27/converter/pbm/pbmto10x.c.security 2004-03-20 05:23:36.000000000 +0100
+++ netpbm-10.27/converter/pbm/pbmto10x.c 2005-03-29 14:31:43.053565608 +0200
+++ netpbm-10.27/converter/pbm/pbmto10x.c 2005-05-16 11:12:44.052379784 +0200
@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
res_60x72();
@ -1340,7 +1340,7 @@
--- netpbm-10.27/converter/pbm/pbmto4425.c.security 2002-09-06 18:03:50.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmto4425.c 2005-03-29 14:31:43.054565456 +0200
+++ netpbm-10.27/converter/pbm/pbmto4425.c 2005-05-16 11:12:44.053379632 +0200
@@ -1,6 +1,7 @@
#include <string.h>
@ -1359,7 +1359,7 @@
{
pm_error( "Cannot allocate memory" );
--- netpbm-10.27/converter/pbm/pbmtocmuwm.c.security 1993-10-04 10:10:46.000000000 +0100
+++ netpbm-10.27/converter/pbm/pbmtocmuwm.c 2005-03-29 14:31:43.055565304 +0200
+++ netpbm-10.27/converter/pbm/pbmtocmuwm.c 2005-05-16 11:12:44.054379480 +0200
@@ -43,6 +43,7 @@ main( argc, argv )
bitrow = pbm_allocrow( cols );
@ -1369,7 +1369,7 @@
putinit( rows, cols );
--- netpbm-10.27/converter/pbm/pbmtogo.c.security 2002-07-30 17:47:49.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtogo.c 2005-03-29 14:31:43.056565152 +0200
+++ netpbm-10.27/converter/pbm/pbmtogo.c 2005-05-16 11:12:44.055379328 +0200
@@ -90,6 +90,7 @@ main( argc, argv )
bitrow = pbm_allocrow(cols);
@ -1379,7 +1379,7 @@
bytesperrow = rucols; /* GraphOn uses bytes */
rucols = rucols * 8;
--- netpbm-10.27/converter/pbm/pbmtoxbm.c.security 2004-03-13 20:37:59.000000000 +0100
+++ netpbm-10.27/converter/pbm/pbmtoxbm.c 2005-03-29 14:31:43.057565000 +0200
+++ netpbm-10.27/converter/pbm/pbmtoxbm.c 2005-05-16 11:12:44.055379328 +0200
@@ -100,6 +100,7 @@ main(int argc, char * argv[]) {
bitrow = pbm_allocrow(cols);
@ -1389,7 +1389,7 @@
printf("#define %s_width %d\n", name, cols);
--- netpbm-10.27/converter/pbm/pbmtox10bm.c.security 2002-07-30 17:47:46.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtox10bm.c 2005-03-29 14:31:43.058564848 +0200
+++ netpbm-10.27/converter/pbm/pbmtox10bm.c 2005-05-16 11:12:44.056379176 +0200
@@ -57,6 +57,7 @@ main( argc, argv )
bitrow = pbm_allocrow( cols );
@ -1399,7 +1399,7 @@
printf( "#define %s_width %d\n", name, cols );
--- netpbm-10.27/converter/pbm/mdatopbm.c.security 2004-03-20 05:09:15.000000000 +0100
+++ netpbm-10.27/converter/pbm/mdatopbm.c 2005-03-29 14:31:43.059564696 +0200
+++ netpbm-10.27/converter/pbm/mdatopbm.c 2005-05-16 11:12:44.057379024 +0200
@@ -245,10 +245,13 @@ main(int argc, char **argv) {
pm_readlittleshort(infile, &yy); nInCols = yy;
}
@ -1416,7 +1416,7 @@
data = pbm_allocarray(nOutCols, nOutRows);
--- netpbm-10.27/converter/pbm/thinkjettopbm.l.security 2005-01-02 23:39:18.000000000 +0100
+++ netpbm-10.27/converter/pbm/thinkjettopbm.l 2005-03-29 14:31:43.060564544 +0200
+++ netpbm-10.27/converter/pbm/thinkjettopbm.l 2005-05-16 11:12:44.058378872 +0200
@@ -94,7 +94,9 @@ DIG [0-9]
<RASTERMODE>\033\*b{DIG}+W {
int l;
@ -1437,7 +1437,7 @@
packed_bitrow = malloc(maxRowLength);
--- netpbm-10.27/converter/pbm/pbmtoppa/pbm.c.security 2000-06-01 19:20:30.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtoppa/pbm.c 2005-03-29 14:31:43.061564392 +0200
+++ netpbm-10.27/converter/pbm/pbmtoppa/pbm.c 2005-05-16 11:12:44.058378872 +0200
@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned
return 0;
@ -1457,7 +1457,7 @@
pbm->current_line--;
}
--- netpbm-10.27/converter/pbm/pbmtoppa/pbmtoppa.c.security 2002-07-30 17:48:16.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtoppa/pbmtoppa.c 2005-03-29 14:31:43.062564240 +0200
+++ netpbm-10.27/converter/pbm/pbmtoppa/pbmtoppa.c 2005-05-16 11:12:44.059378720 +0200
@@ -471,6 +471,7 @@ main (int argc, char *argv[])
}
}
@ -1467,7 +1467,7 @@
printer.fptr=out;
--- netpbm-10.27/converter/pbm/pktopbm.c.security 2004-03-20 05:52:21.000000000 +0100
+++ netpbm-10.27/converter/pbm/pktopbm.c 2005-03-29 14:31:43.063564088 +0200
+++ netpbm-10.27/converter/pbm/pktopbm.c 2005-05-16 11:12:44.059378720 +0200
@@ -274,6 +274,7 @@ main(int argc, char *argv[]) {
if (flagbyte == 7) { /* long form preamble */
integer packetlength = get32() ; /* character packet length */
@ -1477,7 +1477,7 @@
/* calculate end of packet */
if ((car >= MAXPKCHAR) || !filename[car]) {
--- netpbm-10.27/converter/pbm/pbmtolj.c.security 2004-03-20 05:43:25.000000000 +0100
+++ netpbm-10.27/converter/pbm/pbmtolj.c 2005-03-29 14:31:43.065563784 +0200
+++ netpbm-10.27/converter/pbm/pbmtolj.c 2005-05-16 11:12:44.060378568 +0200
@@ -30,6 +30,7 @@
#include "pbm.h"
#include <string.h>
@ -1499,7 +1499,7 @@
deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
--- netpbm-10.27/converter/pbm/pbmtoybm.c.security 1993-10-04 10:10:43.000000000 +0100
+++ netpbm-10.27/converter/pbm/pbmtoybm.c 2005-03-29 14:31:43.066563632 +0200
+++ netpbm-10.27/converter/pbm/pbmtoybm.c 2005-05-16 11:12:44.061378416 +0200
@@ -45,6 +45,7 @@ main( argc, argv )
bitrow = pbm_allocrow( cols );
@ -1509,7 +1509,7 @@
putinit( cols, rows );
--- netpbm-10.27/converter/pbm/icontopbm.c.security 2003-01-08 20:19:42.000000000 +0100
+++ netpbm-10.27/converter/pbm/icontopbm.c 2005-03-29 14:31:43.067563480 +0200
+++ netpbm-10.27/converter/pbm/icontopbm.c 2005-05-16 11:12:44.061378416 +0200
@@ -12,6 +12,8 @@
#include <string.h>
@ -1532,7 +1532,7 @@
*dataP = (short unsigned int *) malloc( data_length );
if ( *dataP == NULL )
--- netpbm-10.27/converter/pbm/mgrtopbm.c.security 2005-02-20 20:58:25.000000000 +0100
+++ netpbm-10.27/converter/pbm/mgrtopbm.c 2005-03-29 14:31:43.068563328 +0200
+++ netpbm-10.27/converter/pbm/mgrtopbm.c 2005-05-16 11:12:44.062378264 +0200
@@ -68,6 +68,8 @@ getinit(FILE * const file,
if (head.h_high < ' ' || head.l_high < ' ')
pm_error("Invalid width field in MGR header");
@ -1543,7 +1543,7 @@
*rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
*padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
--- netpbm-10.27/converter/pbm/pbmtoascii.c.security 2002-07-30 17:42:53.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtoascii.c 2005-03-29 14:31:43.069563176 +0200
+++ netpbm-10.27/converter/pbm/pbmtoascii.c 2005-05-16 11:12:44.063378112 +0200
@@ -115,9 +115,11 @@ char* argv[];
pm_usage( usage );
@ -1557,7 +1557,7 @@
for ( row = 0; row < rows; row += gridy )
--- netpbm-10.27/converter/pbm/pbmtogem.c.security 2000-06-09 09:07:05.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtogem.c 2005-03-29 14:31:43.070563024 +0200
+++ netpbm-10.27/converter/pbm/pbmtogem.c 2005-05-16 11:12:44.064377960 +0200
@@ -123,6 +123,7 @@ putinit (rows, cols)
bitsperitem = 0;
bitshift = 7;
@ -1567,7 +1567,7 @@
outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
--- netpbm-10.27/converter/pbm/pbmtomda.c.security 2004-01-11 22:11:22.000000000 +0100
+++ netpbm-10.27/converter/pbm/pbmtomda.c 2005-03-29 14:31:43.071562872 +0200
+++ netpbm-10.27/converter/pbm/pbmtomda.c 2005-05-16 11:12:44.064377960 +0200
@@ -179,6 +179,7 @@ int main(int argc, char **argv)
nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
@ -1577,7 +1577,7 @@
/* MDA wants rows a multiple of 4 */
nOutCols = nInCols / 8;
--- netpbm-10.27/converter/pbm/pbmtomacp.c.security 2002-09-06 18:04:22.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtomacp.c 2005-03-29 14:31:43.072562720 +0200
+++ netpbm-10.27/converter/pbm/pbmtomacp.c 2005-05-16 11:12:44.065377808 +0200
@@ -104,6 +104,7 @@ char *argv[];
if( !lflg )
left = 0;
@ -1596,7 +1596,7 @@
{ if( bottom - top >= MAX_LINES )
bottom = top + MAX_LINES - 1;
--- netpbm-10.27/converter/pbm/ybmtopbm.c.security 1993-10-04 10:10:35.000000000 +0100
+++ netpbm-10.27/converter/pbm/ybmtopbm.c 2005-03-29 14:31:43.073562568 +0200
+++ netpbm-10.27/converter/pbm/ybmtopbm.c 2005-05-16 11:12:44.066377656 +0200
@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
pm_error( "EOF / read error" );
@ -1606,7 +1606,7 @@
bitsperitem = 0;
}
--- netpbm-10.27/converter/pbm/pbmtoicon.c.security 2002-07-30 17:47:48.000000000 +0200
+++ netpbm-10.27/converter/pbm/pbmtoicon.c 2005-03-29 14:31:43.073562568 +0200
+++ netpbm-10.27/converter/pbm/pbmtoicon.c 2005-05-16 11:12:44.066377656 +0200
@@ -42,6 +42,7 @@ main( argc, argv )
bitrow = pbm_allocrow( cols );
@ -1616,7 +1616,7 @@
padleft = pad / 2;
padright = pad - padleft;
--- netpbm-10.27/other/pnmcolormap.c.security 2004-08-11 01:37:03.000000000 +0200
+++ netpbm-10.27/other/pnmcolormap.c 2005-03-29 14:31:43.087560440 +0200
+++ netpbm-10.27/other/pnmcolormap.c 2005-05-16 11:12:44.067377504 +0200
@@ -788,6 +788,7 @@ colormapToSquare(struct pam * const pamP
pamP->width = intsqrt;
else
@ -1626,7 +1626,7 @@
{
unsigned int const intQuotient = colormapSize / pamP->width;
--- netpbm-10.27/doc/COPYRIGHT.PATENT.security 2004-05-01 01:54:22.000000000 +0200
+++ netpbm-10.27/doc/COPYRIGHT.PATENT 2005-03-29 14:31:43.088560288 +0200
+++ netpbm-10.27/doc/COPYRIGHT.PATENT 2005-05-16 11:12:44.068377352 +0200
@@ -33,6 +33,11 @@ no warranties regarding any of the code
all the above to be modified by "to the best of the Netpbm
maintainer's knowledge."
@ -1640,7 +1640,7 @@
PATENTS
--- netpbm-10.27/editor/pnmcrop.c.security 2002-07-30 19:47:37.000000000 +0200
+++ netpbm-10.27/editor/pnmcrop.c 2005-03-29 14:31:43.089560136 +0200
+++ netpbm-10.27/editor/pnmcrop.c 2005-05-16 11:12:44.068377352 +0200
@@ -379,6 +379,8 @@ main(int argc, char *argv[]) {
xelrow = pnm_allocrow(cols);
@ -1651,7 +1651,7 @@
newrows = bottom - top + 1;
pnm_writepnminit(stdout, newcols, newrows, maxval, format, 0);
--- netpbm-10.27/editor/pnmcut.c.security 2002-07-30 19:47:37.000000000 +0200
+++ netpbm-10.27/editor/pnmcut.c 2005-03-29 14:31:43.090559984 +0200
+++ netpbm-10.27/editor/pnmcut.c 2005-05-16 11:12:44.069377200 +0200
@@ -373,6 +373,7 @@ main(int argc, char *argv[]) {
toprow, leftcol, bottomrow, rightcol);
}
@ -1661,7 +1661,7 @@
output_row = pnm_allocrow(output_cols);
--- netpbm-10.27/editor/pnmpaste.c.security 2002-07-30 19:47:35.000000000 +0200
+++ netpbm-10.27/editor/pnmpaste.c 2005-03-29 14:31:43.091559832 +0200
+++ netpbm-10.27/editor/pnmpaste.c 2005-05-16 11:12:44.070377048 +0200
@@ -100,11 +100,16 @@ main( argc, argv )
"y is too large -- the second anymap has only %d rows",
rows2 );
@ -1680,7 +1680,7 @@
pm_error( "x + width is too large by %d pixels", x + cols1 - cols2 );
if ( y + rows1 > rows2 )
--- netpbm-10.27/editor/pbmlife.c.security 1993-10-04 10:10:37.000000000 +0100
+++ netpbm-10.27/editor/pbmlife.c 2005-03-29 14:31:43.091559832 +0200
+++ netpbm-10.27/editor/pbmlife.c 2005-05-16 11:12:44.071376896 +0200
@@ -54,7 +54,7 @@ char* argv[];
prevrow = thisrow;
thisrow = nextrow;
@ -1691,7 +1691,7 @@
for ( col = 0; col < cols; ++col )
--- netpbm-10.27/editor/pbmpscale.c.security 2003-07-06 21:41:04.000000000 +0200
+++ netpbm-10.27/editor/pbmpscale.c 2005-03-29 14:31:43.092559680 +0200
+++ netpbm-10.27/editor/pbmpscale.c 2005-05-16 11:12:44.071376896 +0200
@@ -109,6 +109,7 @@ main(argc, argv)
inrow[0] = inrow[1] = inrow[2] = NULL;
pbm_readpbminit(ifd, &columns, &rows, &format) ;
@ -1700,8 +1700,8 @@
outrow = pbm_allocrow(columns*scale) ;
MALLOCARRAY(flags, columns);
if (flags == NULL)
--- netpbm-10.27/editor/ppmdither.c.security 2005-03-29 14:31:42.975577464 +0200
+++ netpbm-10.27/editor/ppmdither.c 2005-03-29 14:31:43.093559528 +0200
--- netpbm-10.27/editor/ppmdither.c.security 2003-07-06 21:54:02.000000000 +0200
+++ netpbm-10.27/editor/ppmdither.c 2005-05-16 11:12:44.072376744 +0200
@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
(dith_dim * sizeof(int *)) + /* pointers */
(dith_dim * dith_dim * sizeof(int)); /* data */
@ -1718,12 +1718,12 @@
- MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb);
+ overflow2(dith_nr, dith_ng);
+ colormapP = malloc3(dith_nr * dith_ng, dith_nb, sizeof(pixel));
+ *colormapP = malloc3(dith_nr * dith_ng, dith_nb, sizeof(pixel));
if (*colormapP == NULL)
pm_error("Unable to allocate space for the color lookup table "
"(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
--- netpbm-10.27/editor/pnmshear.c.security 2002-12-11 21:00:02.000000000 +0100
+++ netpbm-10.27/editor/pnmshear.c 2005-03-29 14:31:43.094559376 +0200
+++ netpbm-10.27/editor/pnmshear.c 2005-05-16 11:12:44.073376592 +0200
@@ -12,6 +12,7 @@
#include <math.h>
@ -1745,7 +1745,7 @@
pnm_writepnminit( stdout, newcols, rows, newmaxval, newformat, 0 );
--- netpbm-10.27/editor/pnmscalefixed.c.security 2002-07-30 19:52:49.000000000 +0200
+++ netpbm-10.27/editor/pnmscalefixed.c 2005-03-29 14:31:43.095559224 +0200
+++ netpbm-10.27/editor/pnmscalefixed.c 2005-05-16 11:12:44.074376440 +0200
@@ -209,6 +209,8 @@ compute_output_dimensions(const struct c
const int rows, const int cols,
int * newrowsP, int * newcolsP) {
@ -1775,7 +1775,7 @@
syscale = SCALE * newrows / rows;
--- netpbm-10.27/editor/pnmhisteq.c.security 2004-09-18 05:25:46.000000000 +0200
+++ netpbm-10.27/editor/pnmhisteq.c 2005-03-29 14:31:43.095559224 +0200
+++ netpbm-10.27/editor/pnmhisteq.c 2005-05-16 11:12:44.075376288 +0200
@@ -210,6 +210,7 @@ int main(argc, argv)
user has specified an input map file, read it in at
this point. */
@ -1785,7 +1785,7 @@
memset((char *) lumahist, 0, (maxval + 1) * sizeof(long));
--- netpbm-10.27/editor/pnmpad.c.security 2004-05-16 00:02:15.000000000 +0200
+++ netpbm-10.27/editor/pnmpad.c 2005-03-29 14:31:43.096559072 +0200
+++ netpbm-10.27/editor/pnmpad.c 2005-05-16 11:12:44.076376136 +0200
@@ -356,6 +356,8 @@ main(int argc, char ** argv) {
computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
@ -1796,7 +1796,7 @@
xelrow = pnm_allocrow(newcols);
bgrow = pnm_allocrow(newcols);
--- netpbm-10.27/editor/pnmremap.c.security 2005-02-23 05:35:06.000000000 +0100
+++ netpbm-10.27/editor/pnmremap.c 2005-03-29 14:31:43.097558920 +0200
+++ netpbm-10.27/editor/pnmremap.c 2005-05-16 11:12:44.077375984 +0200
@@ -280,6 +280,7 @@ initFserr(struct pam * const pamP, struc
unsigned int const fserrSize = pamP->width + 2;
@ -1814,7 +1814,7 @@
unsigned int plane;
for (plane = 0; plane < pamP->depth; ++plane)
--- netpbm-10.27/editor/pamoil.c.security 2004-05-29 20:01:02.000000000 +0200
+++ netpbm-10.27/editor/pamoil.c 2005-03-29 14:31:43.098558768 +0200
+++ netpbm-10.27/editor/pamoil.c 2005-05-16 11:12:44.078375832 +0200
@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
pm_close(ifp);
@ -1824,7 +1824,7 @@
if (hist == NULL)
pm_error("Unable to allocate memory for histogram.");
--- netpbm-10.27/editor/pbmclean.c.security 2005-02-27 17:33:57.000000000 +0100
+++ netpbm-10.27/editor/pbmclean.c 2005-03-29 14:31:43.099558616 +0200
+++ netpbm-10.27/editor/pbmclean.c 2005-05-16 11:12:44.079375680 +0200
@@ -147,7 +147,7 @@ nextrow(FILE * const ifd, int const row,
inrow[0] = inrow[1];
inrow[1] = inrow[2];
@ -1835,7 +1835,7 @@
if (inrow[2] == NULL)
inrow[2] = pbm_allocrow(cols);
--- netpbm-10.27/editor/pnmindex.csh.security 2000-09-14 07:37:35.000000000 +0200
+++ netpbm-10.27/editor/pnmindex.csh 2005-03-29 14:31:43.100558464 +0200
+++ netpbm-10.27/editor/pnmindex.csh 2005-05-16 11:12:44.079375680 +0200
@@ -1,5 +1,8 @@
#!/bin/csh -f
#
@ -1846,7 +1846,7 @@
#
# Copyright (C) 1991 by Jef Poskanzer.
--- netpbm-10.27/editor/pnmrotate.c.security 2004-02-02 20:19:52.000000000 +0100
+++ netpbm-10.27/editor/pnmrotate.c 2005-03-29 14:31:43.101558312 +0200
+++ netpbm-10.27/editor/pnmrotate.c 2005-05-16 11:12:44.080375528 +0200
@@ -11,6 +11,7 @@
*/
@ -1875,7 +1875,7 @@
direction = cmdline.angle > 0 ? COUNTERCLOCKWISE : CLOCKWISE;
--- netpbm-10.27/editor/pamcut.c.security 2005-01-04 01:07:53.000000000 +0100
+++ netpbm-10.27/editor/pamcut.c 2005-03-29 14:31:43.102558160 +0200
+++ netpbm-10.27/editor/pamcut.c 2005-05-16 11:12:44.081375376 +0200
@@ -509,6 +509,8 @@ main(int argc, char *argv[]) {
outpam.width = rightcol-leftcol+1;
outpam.height = bottomrow-toprow+1;
@ -1886,7 +1886,7 @@
/* Write out top padding */
--- netpbm-10.27/editor/pnmgamma.c.security 2004-06-16 04:28:06.000000000 +0200
+++ netpbm-10.27/editor/pnmgamma.c 2005-03-29 14:31:43.102558160 +0200
+++ netpbm-10.27/editor/pnmgamma.c 2005-05-16 11:12:44.082375224 +0200
@@ -274,6 +274,7 @@ createGammaTables(bool const ungamma,
xelval **rtableP, xelval **gtableP, xelval **btableP) {
@ -1896,7 +1896,7 @@
MALLOCARRAY(*gtableP, maxval+1);
MALLOCARRAY(*btableP, maxval+1);
--- netpbm-10.27/editor/pbmreduce.c.security 2003-07-06 21:41:49.000000000 +0200
+++ netpbm-10.27/editor/pbmreduce.c 2005-03-29 14:31:43.103558008 +0200
+++ netpbm-10.27/editor/pbmreduce.c 2005-05-16 11:12:44.083375072 +0200
@@ -93,6 +93,7 @@ main( argc, argv )
if ( halftone == QT_FS ) {
@ -1905,8 +1905,8 @@
MALLOCARRAY(thiserr, newcols + 2);
MALLOCARRAY(nexterr, newcols + 2);
if ( thiserr == NULL || nexterr == NULL )
--- /dev/null 2005-03-21 10:25:58.558439872 +0100
+++ netpbm-10.27/OPENLICENSE 2005-03-29 14:31:43.104557856 +0200
--- /dev/null 2005-04-04 15:24:37.439457960 +0200
+++ netpbm-10.27/OPENLICENSE 2005-05-16 11:12:44.084374920 +0200
@@ -0,0 +1,163 @@
+ The Open Software License
+ v. 1.1
@ -2072,7 +2072,7 @@
+modification. This license may not be modified without the express written
+permission of its copyright owner.
--- netpbm-10.27/lib/libpammap.c.security 2005-03-17 05:27:49.000000000 +0100
+++ netpbm-10.27/lib/libpammap.c 2005-03-29 14:31:43.105557704 +0200
+++ netpbm-10.27/lib/libpammap.c 2005-05-16 11:12:44.085374768 +0200
@@ -101,6 +101,8 @@ allocTupleIntListItem(struct pam * const
*/
struct tupleint_list_item * retval;
@ -2083,7 +2083,7 @@
sizeof(*retval) - sizeof(retval->tupleint.tuple)
+ pamP->depth * sizeof(sample);
--- netpbm-10.27/lib/libpbmvms.c.security 2000-05-26 20:34:55.000000000 +0200
+++ netpbm-10.27/lib/libpbmvms.c 2005-03-29 14:31:43.106557552 +0200
+++ netpbm-10.27/lib/libpbmvms.c 2005-05-16 11:12:44.085374768 +0200
@@ -1,3 +1,5 @@
+#warning "NOT AUDITED"
+
@ -2091,7 +2091,7 @@
This file contains library routines needed to build Netpbm for VMS.
However, as of 2000.05.26, when these were split out of libpbm1.c
--- netpbm-10.27/lib/libpm.c.security 2005-03-24 20:55:02.000000000 +0100
+++ netpbm-10.27/lib/libpm.c 2005-03-29 14:32:55.703521136 +0200
+++ netpbm-10.27/lib/libpm.c 2005-05-16 11:12:44.086374616 +0200
@@ -36,6 +36,7 @@
/* This makes the the x64() functions available on AIX */
@ -2173,7 +2173,7 @@
+}
--- netpbm-10.27/lib/libpam.c.security 2005-03-17 04:19:49.000000000 +0100
+++ netpbm-10.27/lib/libpam.c 2005-03-29 14:35:34.982307080 +0200
+++ netpbm-10.27/lib/libpam.c 2005-05-16 11:12:44.087374464 +0200
@@ -270,7 +270,8 @@ allocPamRow(const struct pam * const pam
int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
tuple * tuplerow;
@ -2185,7 +2185,7 @@
if (tuplerow != NULL) {
/* Now we initialize the pointers to the individual tuples
--- netpbm-10.27/lib/libpbm1.c.security 2005-02-05 19:41:54.000000000 +0100
+++ netpbm-10.27/lib/libpbm1.c 2005-03-29 14:31:43.112556640 +0200
+++ netpbm-10.27/lib/libpbm1.c 2005-05-16 11:12:44.088374312 +0200
@@ -56,6 +56,7 @@ pbm_check(FILE * file, const enum pm_che
pm_message("pm_filepos passed to pm_check() is %u bytes",
sizeof(pm_filepos));
@ -2195,7 +2195,7 @@
}
}
--- netpbm-10.27/lib/pm.h.security 2005-03-24 21:00:43.000000000 +0100
+++ netpbm-10.27/lib/pm.h 2005-03-29 14:31:43.113556488 +0200
+++ netpbm-10.27/lib/pm.h 2005-05-16 11:12:44.089374160 +0200
@@ -331,6 +331,12 @@ pm_arg0toprogname(const char arg0[]);
@ -2210,7 +2210,7 @@
--- netpbm-10.27/urt/rle_open_f.c.security 2005-01-01 05:03:50.000000000 +0100
+++ netpbm-10.27/urt/rle_open_f.c 2005-03-29 14:31:43.114556336 +0200
+++ netpbm-10.27/urt/rle_open_f.c 2005-05-16 11:12:44.089374160 +0200
@@ -6,6 +6,9 @@
* University of Michigan
* Date: 11/14/89
@ -2243,7 +2243,7 @@
if ( combuf == NULL )
{
--- netpbm-10.27/urt/Runput.c.security 2002-03-13 05:24:43.000000000 +0100
+++ netpbm-10.27/urt/Runput.c 2005-03-29 14:31:43.115556184 +0200
+++ netpbm-10.27/urt/Runput.c 2005-05-16 11:12:44.090374008 +0200
@@ -17,6 +17,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@ -2277,7 +2277,7 @@
{
fprintf( stderr,
--- netpbm-10.27/urt/rle_addhist.c.security 2003-01-08 20:35:44.000000000 +0100
+++ netpbm-10.27/urt/rle_addhist.c 2005-03-29 14:31:43.115556184 +0200
+++ netpbm-10.27/urt/rle_addhist.c 2005-05-16 11:12:44.091373856 +0200
@@ -14,6 +14,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -2327,7 +2327,7 @@
-
}
--- netpbm-10.27/urt/rle_getrow.c.security 2004-10-19 17:41:01.000000000 +0200
+++ netpbm-10.27/urt/rle_getrow.c 2005-03-29 14:31:43.117555880 +0200
+++ netpbm-10.27/urt/rle_getrow.c 2005-05-16 11:12:44.091373856 +0200
@@ -17,6 +17,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@ -2381,7 +2381,7 @@
{
fprintf( stderr,
--- netpbm-10.27/urt/rle.h.security 2002-03-13 16:32:34.000000000 +0100
+++ netpbm-10.27/urt/rle.h 2005-03-29 14:31:43.118555728 +0200
+++ netpbm-10.27/urt/rle.h 2005-05-16 11:12:44.092373704 +0200
@@ -14,6 +14,9 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -2410,7 +2410,7 @@
/* Declare RLE library routines. */
--- netpbm-10.27/urt/README.security 2000-06-02 22:53:04.000000000 +0200
+++ netpbm-10.27/urt/README 2005-03-29 14:31:43.118555728 +0200
+++ netpbm-10.27/urt/README 2005-05-16 11:12:44.092373704 +0200
@@ -18,3 +18,8 @@ in its initializer in the original. But
defines stdout as a variable, so that wouldn't compile. So I changed
it to NULL and added a line to rle_hdr_init to set that field to
@ -2421,7 +2421,7 @@
+
+Alan Cox <alan@redhat.com>
--- netpbm-10.27/urt/scanargs.c.security 2003-01-08 20:38:25.000000000 +0100
+++ netpbm-10.27/urt/scanargs.c 2005-03-29 14:31:43.120555424 +0200
+++ netpbm-10.27/urt/scanargs.c 2005-05-16 11:12:44.093373552 +0200
@@ -38,6 +38,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@ -2443,7 +2443,7 @@
#if defined(c_plusplus) && !defined(USE_PROTOTYPES)
#define USE_PROTOTYPES
--- netpbm-10.27/urt/rle_putcom.c.security 2000-05-19 01:12:22.000000000 +0200
+++ netpbm-10.27/urt/rle_putcom.c 2005-03-29 14:31:43.121555272 +0200
+++ netpbm-10.27/urt/rle_putcom.c 2005-05-16 11:12:44.094373400 +0200
@@ -14,6 +14,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -2487,7 +2487,7 @@
the_hdr->comments[--i] = value;
for ( i--; i >= 0; i-- )
--- netpbm-10.27/urt/rle_hdr.c.security 2000-06-09 09:49:51.000000000 +0200
+++ netpbm-10.27/urt/rle_hdr.c 2005-03-29 14:31:43.122555120 +0200
+++ netpbm-10.27/urt/rle_hdr.c 2005-05-16 11:12:44.095373248 +0200
@@ -14,6 +14,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -2555,7 +2555,7 @@
to_hdr->comments = (CONST_DECL char **)malloc( size );
RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
--- netpbm-10.27/analyzer/pgmhist.c.security 2003-07-06 21:23:19.000000000 +0200
+++ netpbm-10.27/analyzer/pgmhist.c 2005-03-29 14:31:43.123554968 +0200
+++ netpbm-10.27/analyzer/pgmhist.c 2005-05-16 11:12:44.095373248 +0200
@@ -45,6 +45,7 @@ main( argc, argv )
grayrow = pgm_allocrow( cols );
@ -2565,7 +2565,7 @@
MALLOCARRAY(rcount, maxval + 1);
if ( hist == NULL || rcount == NULL )
--- netpbm-10.27/analyzer/pgmtexture.c.security 2003-08-07 18:18:16.000000000 +0200
+++ netpbm-10.27/analyzer/pgmtexture.c 2005-03-29 14:31:43.124554816 +0200
+++ netpbm-10.27/analyzer/pgmtexture.c 2005-05-16 11:12:44.096373096 +0200
@@ -75,7 +75,10 @@ vector (int nl, int nh)
{
float *v;

40
netpbm.spec
View File

@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats.
Name: netpbm
Version: 10.27
Release: 2
Release: 3
License: freeware
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
@ -13,15 +13,14 @@ Patch3: netpbm-10.18-manpath.patch
Patch4: netpbm-10.19-message.patch
Patch5: netpbm-10.22-security2.patch
Patch6: netpbm-10.22-cmapsize.patch
Patch7: netpbm-10.23-gcc34.patch
Patch8: netpbm-10.23-security.patch
Patch9: netpbm-10.23-pngtopnm.patch
Patch10: netpbm-10.24-nodoc.patch
Patch11: netpbm-10.26.4-gcc4.patch
Patch12: netpbm-10.27-badlink.patch
Patch13: netpbm-10.27-bmptopnm.patch
Patch14: netpbm-10.27-libpm.patch
Patch15: netpbm-10.27-pnmtojpeg.patch
Patch7: netpbm-10.23-security.patch
Patch8: netpbm-10.23-pngtopnm.patch
Patch9: netpbm-10.24-nodoc.patch
Patch10: netpbm-10.26.4-gcc4.patch
Patch11: netpbm-10.27-badlink.patch
Patch12: netpbm-10.27-bmptopnm.patch
Patch13: netpbm-10.27-libpm.patch
Patch14: netpbm-10.27-pnmtojpeg.patch
Buildroot: %{_tmppath}/%{name}-root
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
Obsoletes: libgr
@ -71,15 +70,14 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch4 -p1 -b .message
%patch5 -p1 -b .security2
%patch6 -p1 -b .cmapsize
%patch7 -p1 -b .gcc34
%patch8 -p1 -b .security
%patch9 -p1 -b .pngtopnm
%patch10 -p1 -b .nodoc
%patch11 -p1 -b .gcc4
%patch12 -p1 -b .badlink
%patch13 -p1 -b .bmptopnm
%patch14 -p1 -b .libpm
%patch15 -p1 -b .pnmtojpeg
%patch7 -p1 -b .security
%patch8 -p1 -b .pngtopnm
%patch9 -p1 -b .nodoc
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .badlink
%patch12 -p1 -b .bmptopnm
%patch13 -p1 -b .libpm
%patch14 -p1 -b .pnmtojpeg
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@ -177,6 +175,10 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template
%{_mandir}/man5/*
%changelog
* Mon May 16 2005 Jindrich Novy <jnovy@redhat.com> 10.27-3
- fix ppmdither leak caused by bug in security patch (#157757)
- drop gcc34 patch
* Mon May 09 2005 Jindrich Novy <jnovy@redhat.com> 10.27-2
- fix invalid strcmp condition in bmptopnm, typo in pnmtojpeg
(David Constanzo, #157106, #157118)