From 1dc0099f588abf52d3a7e7650363f0feb5c97c23 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Dec 30 2005 14:10:19 +0000 Subject: - update to 10.31 - update security patch - regenerate man pages --- diff --git a/.cvsignore b/.cvsignore index 0e521b1..66baa7e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -14,3 +14,5 @@ netpbm-10.29.tar.bz2 netpbmdoc-10.29.tar.bz2 netpbmdoc-10.30.tar.bz2 netpbm-10.30.tar.bz2 +netpbmdoc-10.31.tar.bz2 +netpbm-10.31.tar.bz2 diff --git a/netpbm-10.23-security.patch b/netpbm-10.23-security.patch index 3663d1c..76d17ad 100644 --- a/netpbm-10.23-security.patch +++ b/netpbm-10.23-security.patch @@ -1,5 +1,5 @@ ---- /dev/null 2005-10-21 08:18:57.827007136 +0200 -+++ netpbm-10.30/OPENLICENSE 2005-10-21 11:08:57.000000000 +0200 +--- /dev/null 2005-12-28 07:55:55.980549750 +0100 ++++ netpbm-10.31/OPENLICENSE 2005-12-30 10:44:51.000000000 +0100 @@ -0,0 +1,163 @@ + The Open Software License + v. 1.1 @@ -164,8 +164,8 @@ +Permission is hereby granted to copy and distribute this license without +modification. This license may not be modified without the express written +permission of its copyright owner. ---- netpbm-10.30/generator/pbmtext.c.security 2005-07-18 03:14:10.000000000 +0200 -+++ netpbm-10.30/generator/pbmtext.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/generator/pbmtext.c.security 2005-07-18 03:14:10.000000000 +0200 ++++ netpbm-10.31/generator/pbmtext.c 2005-12-30 10:44:51.000000000 +0100 @@ -89,12 +89,14 @@ parse_command_line(int argc, char ** arg for (i = 1; i < argc; i++) { @@ -230,8 +230,8 @@ cols = 2 * hmargin + maxwidth; bits = pbm_allocarray(cols, rows); ---- netpbm-10.30/generator/pgmkernel.c.security 2003-07-06 22:03:29.000000000 +0200 -+++ netpbm-10.30/generator/pgmkernel.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/generator/pgmkernel.c.security 2003-07-06 22:03:29.000000000 +0200 ++++ netpbm-10.31/generator/pgmkernel.c 2005-12-30 10:44:51.000000000 +0100 @@ -68,7 +68,7 @@ main ( argc, argv ) kycenter = (fysize - 1) / 2.0; ixsize = fxsize + 0.999; @@ -241,9 +241,9 @@ for (i = 0; i < iysize; i++) for (j = 0; j < ixsize; j++) { fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double) ---- netpbm-10.30/generator/pgmcrater.c.security 2005-09-10 22:51:24.000000000 +0200 -+++ netpbm-10.30/generator/pgmcrater.c 2005-10-21 11:08:57.000000000 +0200 -@@ -129,7 +129,7 @@ static void gencraters() +--- netpbm-10.31/generator/pgmcrater.c.security 2005-12-22 10:28:49.000000000 +0100 ++++ netpbm-10.31/generator/pgmcrater.c 2005-12-30 10:44:51.000000000 +0100 +@@ -131,7 +131,7 @@ static void gencraters() /* Acquire the elevation array and initialize it to mean surface elevation. */ @@ -252,8 +252,8 @@ if (aux == NULL) pm_error("out of memory allocating elevation array"); ---- netpbm-10.30/generator/pbmpage.c.security 2005-08-27 19:27:19.000000000 +0200 -+++ netpbm-10.30/generator/pbmpage.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/generator/pbmpage.c.security 2005-08-27 19:27:19.000000000 +0200 ++++ netpbm-10.31/generator/pbmpage.c 2005-12-30 10:44:51.000000000 +0100 @@ -170,6 +170,9 @@ outputPbm(FILE * const file, /* We round the allocated row space up to a multiple of 8 so the ugly fast code below can work. @@ -264,8 +264,8 @@ pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8); bitmap_cursor = 0; ---- netpbm-10.30/generator/ppmrainbow.security 2003-01-04 01:40:56.000000000 +0100 -+++ netpbm-10.30/generator/ppmrainbow 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/generator/ppmrainbow.security 2003-01-04 01:40:56.000000000 +0100 ++++ netpbm-10.31/generator/ppmrainbow 2005-12-30 10:44:51.000000000 +0100 @@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v # set defaults $Twid = 600; @@ -275,18 +275,18 @@ $norepeat = $FALSE; $verbose = $FALSE; ---- netpbm-10.30/other/pnmcolormap.c.security 2005-09-23 18:28:19.000000000 +0200 -+++ netpbm-10.30/other/pnmcolormap.c 2005-10-21 11:08:57.000000000 +0200 -@@ -774,6 +774,7 @@ colormapToSquare(struct pam * const pamP +--- netpbm-10.31/other/pnmcolormap.c.security 2005-12-21 05:35:06.000000000 +0100 ++++ netpbm-10.31/other/pnmcolormap.c 2005-12-30 10:44:51.000000000 +0100 +@@ -836,6 +836,7 @@ colormapToSquare(struct pam * const pamP pamP->width = intsqrt; else pamP->width = intsqrt + 1; + overflow_add(intsqrt, 1); } { - unsigned int const intQuotient = colormapSize / pamP->width; ---- netpbm-10.30/doc/COPYRIGHT.PATENT.security 2004-05-01 01:54:22.000000000 +0200 -+++ netpbm-10.30/doc/COPYRIGHT.PATENT 2005-10-21 11:08:57.000000000 +0200 + unsigned int const intQuotient = colormap.size / pamP->width; +--- netpbm-10.31/doc/COPYRIGHT.PATENT.security 2004-05-01 01:54:22.000000000 +0200 ++++ netpbm-10.31/doc/COPYRIGHT.PATENT 2005-12-30 10:44:51.000000000 +0100 @@ -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." @@ -299,8 +299,8 @@ PATENTS ---- netpbm-10.30/converter/pgm/psidtopgm.c.security 2005-08-27 20:38:40.000000000 +0200 -+++ netpbm-10.30/converter/pgm/psidtopgm.c 2005-10-21 12:13:31.000000000 +0200 +--- netpbm-10.31/converter/pgm/psidtopgm.c.security 2005-08-27 20:38:40.000000000 +0200 ++++ netpbm-10.31/converter/pgm/psidtopgm.c 2005-12-30 10:44:51.000000000 +0100 @@ -78,6 +78,7 @@ main(int argc, pm_error("bits/sample (%d) is too large.", bitspersample); @@ -309,8 +309,8 @@ grayrow = pgm_allocrow((cols + 7) / 8 * 8); for (row = 0; row < rows; ++row) { unsigned int col; ---- netpbm-10.30/converter/pgm/lispmtopgm.c.security 2005-10-07 09:03:29.000000000 +0200 -+++ netpbm-10.30/converter/pgm/lispmtopgm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pgm/lispmtopgm.c.security 2005-10-07 09:03:29.000000000 +0200 ++++ netpbm-10.31/converter/pgm/lispmtopgm.c 2005-12-30 10:44:51.000000000 +0100 @@ -58,6 +58,7 @@ main( argc, argv ) pm_error( "depth (%d bits) is too large", depth); @@ -330,8 +330,8 @@ *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP; if ( *colsP != (cols_32 - *padrightP) ) { ---- netpbm-10.30/converter/ppm/pjtoppm.c.security 2003-07-06 23:45:36.000000000 +0200 -+++ netpbm-10.30/converter/ppm/pjtoppm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/pjtoppm.c.security 2003-07-06 23:45:36.000000000 +0200 ++++ netpbm-10.31/converter/ppm/pjtoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -127,19 +127,21 @@ main(argc, argv) case 'V': /* send plane */ case 'W': /* send last plane */ @@ -381,8 +381,8 @@ cols *= 8; } ---- netpbm-10.30/converter/ppm/ppmtoicr.c.security 2003-02-22 23:05:03.000000000 +0100 -+++ netpbm-10.30/converter/ppm/ppmtoicr.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/ppmtoicr.c.security 2003-02-22 23:05:03.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtoicr.c 2005-12-30 10:44:51.000000000 +0100 @@ -169,7 +169,7 @@ char* argv[]; if (rleflag) { @@ -392,8 +392,8 @@ p = testimage; for (i=0; idecoded_cb[y], "malloc"); } ---- netpbm-10.30/converter/ppm/ppmtompeg/jpeg.c.security 2005-08-27 20:21:18.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtompeg/jpeg.c 2005-10-21 11:08:57.000000000 +0200 -@@ -228,7 +228,7 @@ int end; /* last frame to - exit(1); - } - -- inoffsets = (int *)malloc(no_frames*sizeof(int)); -+ inoffsets = (int *)malloc2(no_frames, sizeof(int)); - - if (fread (&(width),sizeof(int),1,inFile) != 1) - { ---- netpbm-10.30/converter/ppm/ppmtompeg/iframe.c.security 2005-08-27 20:14:17.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtompeg/iframe.c 2005-10-21 11:08:57.000000000 +0200 -@@ -859,6 +859,7 @@ BlockComputeSNR(current, snr, psnr) - int ysz = (Fsize_y>>3) * sizeof(int32 *); - int xsz = (Fsize_x>>3); - -+ overflow2(Fsize_y>>3, sizeof(int32 *)); - needs_init = FALSE; - for (y=0; y<3; y++) { - varDiff[y] = ratio[y] = total[y] = 0.0; -@@ -877,6 +878,7 @@ BlockComputeSNR(current, snr, psnr) - fprintf(stderr, "Out of memory in BlockComputeSNR\n"); - exit(-1); - } -+ overflow2(xsz, 4); - for (y = 0; y < ySize[0]>>3; y++) { - SignalY[y] = (int32 *) calloc(xsz,4); - SignalCr[y] = (int32 *) calloc(xsz,4); -@@ -1032,27 +1034,27 @@ AllocDctBlocks() +--- netpbm-10.31/converter/ppm/ppmtompeg/iframe.c.security 2005-12-22 09:57:48.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtompeg/iframe.c 2005-12-30 14:32:29.000000000 +0100 +@@ -767,7 +767,8 @@ BlockComputeSNR(MpegFrame * const curren + if (needs_init) { + int ysz = (Fsize_y>>3) * sizeof(int32 *); + int xsz = (Fsize_x>>3); +- ++ ++ overflow2((Fsize_y>>3), sizeof(int32 *)); + needs_init = FALSE; + for (y=0; y<3; y++) { + varDiff[y] = ratio[y] = total[y] = 0.0; +@@ -786,6 +787,7 @@ BlockComputeSNR(MpegFrame * const curren + fprintf(stderr, "Out of memory in BlockComputeSNR\n"); + exit(-1); + } ++ overflow2(xsz,4); + for (y = 0; y < ySize[0]>>3; y++) { + SignalY[y] = (int32 *) calloc(xsz,4); + SignalCr[y] = (int32 *) calloc(xsz,4); +@@ -944,27 +946,27 @@ AllocDctBlocks(void) { dctx = Fsize_x / DCTSIZE; dcty = Fsize_y / DCTSIZE; @@ -708,18 +699,18 @@ + dct = (Block **) malloc2(sizeof(Block *), dcty); ERRCHK(dct, "malloc"); for (i = 0; i < dcty; i++) { -- dct[i] = (Block *) malloc(sizeof(Block) * dctx); -+ dct[i] = (Block *) malloc2(sizeof(Block), dctx); - ERRCHK(dct[i], "malloc"); +- dct[i] = (Block *) malloc(sizeof(Block) * dctx); ++ dct[i] = (Block *) malloc2(sizeof(Block), dctx); + ERRCHK(dct[i], "malloc"); } - dct_data = (dct_data_type **) malloc(sizeof(dct_data_type *) * dcty); + dct_data = (dct_data_type **) malloc2(sizeof(dct_data_type *), dcty); ERRCHK(dct_data, "malloc"); for (i = 0; i < dcty; i++) { -- dct_data[i] = (dct_data_type *) malloc(sizeof(dct_data_type) * dctx); -+ dct_data[i] = (dct_data_type *) malloc2(sizeof(dct_data_type), dctx); - ERRCHK(dct[i], "malloc"); +- dct_data[i] = (dct_data_type *) malloc(sizeof(dct_data_type) * dctx); ++ dct_data[i] = (dct_data_type *) malloc2(sizeof(dct_data_type), dctx); + ERRCHK(dct[i], "malloc"); } - dctr = (Block **) malloc(sizeof(Block *) * (dcty >> 1)); @@ -729,15 +720,15 @@ ERRCHK(dctr, "malloc"); ERRCHK(dctb, "malloc"); for (i = 0; i < (dcty >> 1); i++) { -- dctr[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -- dctb[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -+ dctr[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); -+ dctb[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); - ERRCHK(dctr[i], "malloc"); - ERRCHK(dctb[i], "malloc"); +- dctr[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); +- dctb[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); ++ dctr[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); ++ dctb[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); + ERRCHK(dctr[i], "malloc"); + ERRCHK(dctb[i], "malloc"); } ---- netpbm-10.30/converter/ppm/ppmtopj.c.security 2005-10-07 09:01:27.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtopj.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/ppmtopj.c.security 2005-10-07 09:01:27.000000000 +0200 ++++ netpbm-10.31/converter/ppm/ppmtopj.c 2005-12-30 10:44:51.000000000 +0100 @@ -179,6 +179,7 @@ char *argv[]; pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); @@ -746,8 +737,8 @@ obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char)); cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char)); ---- netpbm-10.30/converter/ppm/imgtoppm.c.security 2002-09-06 18:30:03.000000000 +0200 -+++ netpbm-10.30/converter/ppm/imgtoppm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/imgtoppm.c.security 2002-09-06 18:30:03.000000000 +0200 ++++ netpbm-10.31/converter/ppm/imgtoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -84,6 +84,7 @@ main(int argc, char ** argv) { len = atoi((char*) buf ); if ( fread( buf, len, 1, ifp ) != 1 ) @@ -764,8 +755,8 @@ if ( len != cols * rows ) pm_message( "pixel data length (%d) does not match image size (%d)", ---- netpbm-10.30/converter/ppm/ximtoppm.c.security 2005-10-07 08:59:40.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ximtoppm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/ximtoppm.c.security 2005-10-07 08:59:40.000000000 +0200 ++++ netpbm-10.31/converter/ppm/ximtoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -111,6 +111,7 @@ ReadXimHeader(FILE * const in_fp, header->bits_channel = atoi(a_head.bits_per_channel); header->alpha_flag = atoi(a_head.alpha_channel); @@ -798,8 +789,8 @@ header->colors = (Color *)calloc((unsigned int)header->ncolors, sizeof(Color)); if (header->colors == NULL) { ---- netpbm-10.30/converter/ppm/pcxtoppm.c.security 2005-09-17 23:47:04.000000000 +0200 -+++ netpbm-10.30/converter/ppm/pcxtoppm.c 2005-10-21 11:58:45.000000000 +0200 +--- netpbm-10.31/converter/ppm/pcxtoppm.c.security 2005-09-17 23:47:04.000000000 +0200 ++++ netpbm-10.31/converter/ppm/pcxtoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -407,6 +407,7 @@ pcx_planes_to_pixels(pixels, bitplanes, /* * clear the pixel buffer @@ -824,8 +815,8 @@ pcxrow = (unsigned char *) pm_allocrow(Planes * BytesPerLine, sizeof(unsigned char)); rawrow = (unsigned char *)pm_allocrow(rawcols, sizeof(unsigned char)); ---- netpbm-10.30/converter/ppm/ppmtopict.c.security 2003-02-22 23:04:40.000000000 +0100 -+++ netpbm-10.30/converter/ppm/ppmtopict.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/ppmtopict.c.security 2003-02-22 23:04:40.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtopict.c 2005-12-30 10:44:51.000000000 +0100 @@ -245,6 +245,8 @@ char *argv[]; putShort(stdout, 0); /* mode */ @@ -835,9 +826,9 @@ packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1)); oc = 0; for (row = 0; row < rows; row++) ---- netpbm-10.30/converter/ppm/ppmtomitsu.c.security 2003-07-06 23:04:25.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtomitsu.c 2005-10-21 11:08:57.000000000 +0200 -@@ -164,6 +164,8 @@ int main( argc, argv ) +--- netpbm-10.31/converter/ppm/ppmtomitsu.c.security 2005-12-22 09:54:51.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtomitsu.c 2005-12-30 10:44:51.000000000 +0100 +@@ -166,6 +166,8 @@ int main( argc, argv ) medias = MSize_User; if (dpi300) { @@ -846,9 +837,9 @@ medias.maxcols *= 2; medias.maxrows *= 2; } ---- netpbm-10.30/converter/ppm/ppmtoilbm.c.security 2005-08-27 19:44:48.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtoilbm.c 2005-10-21 11:08:57.000000000 +0200 -@@ -811,11 +811,15 @@ main(argc, argv) +--- netpbm-10.31/converter/ppm/ppmtoilbm.c.security 2005-12-22 09:54:38.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtoilbm.c 2005-12-30 10:44:51.000000000 +0100 +@@ -812,11 +812,15 @@ main(argc, argv) if( mode != MODE_CMAP ) { register int i; @@ -865,7 +856,7 @@ } switch( mode ) { -@@ -1906,6 +1910,7 @@ ppm_to_rgb8(ifp, cols, rows, maxval) +@@ -1907,6 +1911,7 @@ ppm_to_rgb8(ifp, cols, rows, maxval) maskmethod = 0; /* no masking - RGB8 uses genlock bits */ compmethod = 4; /* RGB8 files are always compressed */ @@ -873,7 +864,7 @@ MALLOCARRAY_NOFAIL(compr_row, cols * 4); if( maxval != 255 ) { -@@ -1994,6 +1999,7 @@ ppm_to_rgbn(ifp, cols, rows, maxval) +@@ -1995,6 +2000,7 @@ ppm_to_rgbn(ifp, cols, rows, maxval) maskmethod = 0; /* no masking - RGBN uses genlock bits */ compmethod = 4; /* RGBN files are always compressed */ @@ -881,7 +872,7 @@ MALLOCARRAY_NOFAIL(compr_row, cols * 2); if( maxval != 15 ) { -@@ -2476,6 +2482,7 @@ make_val_table(oldmaxval, newmaxval) +@@ -2477,6 +2483,7 @@ make_val_table(oldmaxval, newmaxval) int i; int *table; @@ -889,9 +880,9 @@ MALLOCARRAY_NOFAIL(table, oldmaxval + 1); for(i = 0; i <= oldmaxval; i++ ) table[i] = (i * newmaxval + oldmaxval/2) / oldmaxval; ---- netpbm-10.30/converter/ppm/ilbmtoppm.c.security 2005-09-30 00:15:52.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ilbmtoppm.c 2005-10-21 11:08:57.000000000 +0200 -@@ -594,6 +594,7 @@ decode_row(FILE * const ifP, +--- netpbm-10.31/converter/ppm/ilbmtoppm.c.security 2005-12-22 09:51:05.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ilbmtoppm.c 2005-12-30 10:44:51.000000000 +0100 +@@ -595,6 +595,7 @@ decode_row(FILE * const ifP, rawtype *chp; cols = bmhdP->w; @@ -899,7 +890,7 @@ bytes = RowBytes(cols); for( plane = 0; plane < nPlanes; plane++ ) { int mask; -@@ -681,6 +682,23 @@ decode_mask(FILE * const ifP, +@@ -682,6 +683,23 @@ decode_mask(FILE * const ifP, Multipalette handling ****************************************************************************/ @@ -923,7 +914,7 @@ static void multi_adjust(cmap, row, palchange) -@@ -1293,6 +1311,9 @@ dcol_to_ppm(FILE * const ifP, +@@ -1294,6 +1312,9 @@ dcol_to_ppm(FILE * const ifP, if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); @@ -933,7 +924,7 @@ MALLOCARRAY_NOFAIL(redtable, redmaxval +1); MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); -@@ -1724,7 +1745,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data +@@ -1725,7 +1746,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data ChangeCount32 = *data++; datasize -= 2; @@ -943,7 +934,7 @@ for( i = 0; i < changes; i++ ) { if( totalchanges >= PCHG->TotalChanges ) goto fail; if( datasize < 2 ) goto fail; -@@ -1851,6 +1874,7 @@ PCHG_ConvertBig(PCHG, cmap, mask, datasi +@@ -1852,6 +1875,7 @@ PCHG_ConvertBig(PCHG, cmap, mask, datasi if( datasize < 2 ) goto fail; changes = BIG_WORD(data); data += 2; datasize -= 2; @@ -951,7 +942,7 @@ MALLOCARRAY_NOFAIL(cmap->mp_change[row], changes + 1); for( i = 0; i < changes; i++ ) { if( totalchanges >= PCHG->TotalChanges ) goto fail; -@@ -1964,6 +1988,9 @@ read_pchg(FILE * const ifp, +@@ -1965,6 +1989,9 @@ read_pchg(FILE * const ifp, cmap->mp_change[i] = NULL; if( PCHG.StartLine < 0 ) { int nch; @@ -961,7 +952,7 @@ nch = PCHG.MaxReg - PCHG.MinReg +1; MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1); for( i = 0; i < nch; i++ ) -@@ -2040,6 +2067,7 @@ process_body( FILE * const ifp, +@@ -2041,6 +2068,7 @@ process_body( FILE * const ifp, if( typeid == ID_ILBM ) { int isdeep; @@ -969,8 +960,8 @@ MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w)); *viewportmodesP |= fakeviewport; /* -isham/-isehb */ ---- netpbm-10.30/converter/ppm/sldtoppm.c.security 2005-10-07 09:00:51.000000000 +0200 -+++ netpbm-10.30/converter/ppm/sldtoppm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/sldtoppm.c.security 2005-10-07 09:00:51.000000000 +0200 ++++ netpbm-10.31/converter/ppm/sldtoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -306,7 +306,9 @@ static void slider(slvec, slflood) } @@ -982,18 +973,20 @@ pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); PPM_ASSIGN(rgbcolor, 0, 0, 0); ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, ---- netpbm-10.30/converter/ppm/ppmtolj.c.security 2005-08-15 01:37:50.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtolj.c 2005-10-21 11:08:57.000000000 +0200 -@@ -181,6 +181,7 @@ int main(int argc, char *argv[]) { - pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); +--- netpbm-10.31/converter/ppm/ppmtolj.c.security 2005-11-27 07:59:21.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtolj.c 2005-12-30 10:54:29.000000000 +0100 +@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) { - pm_close( ifp ); -+ overflow2(cols,6); + ppm_readppminit( ifp, &cols, &rows, &maxval, &format ); + pixelrow = ppm_allocrow( cols ); +- ++ ++ overflow2(cols, 6); 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.30/converter/ppm/ppmtopcx.c.security 2005-08-27 20:25:49.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtopcx.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/ppmtopcx.c.security 2005-08-27 20:25:49.000000000 +0200 ++++ netpbm-10.31/converter/ppm/ppmtopcx.c 2005-12-30 10:44:51.000000000 +0100 @@ -418,6 +418,8 @@ ppmTo16ColorPcx(pixel ** cons else Planes = 1; } @@ -1003,8 +996,8 @@ BytesPerLine = ((cols * BitsPerPixel) + 7) / 8; MALLOCARRAY_NOFAIL(indexRow, cols); MALLOCARRAY_NOFAIL(planesrow, BytesPerLine); ---- netpbm-10.30/converter/ppm/Makefile.security 2005-10-21 11:08:57.000000000 +0200 -+++ netpbm-10.30/converter/ppm/Makefile 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/Makefile.security 2005-12-30 10:44:51.000000000 +0100 ++++ netpbm-10.31/converter/ppm/Makefile 2005-12-30 10:44:51.000000000 +0100 @@ -11,7 +11,7 @@ SUBDIRS = ppmtompeg PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ @@ -1014,8 +1007,8 @@ ppmtoacad ppmtoarbtxt \ ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ ---- netpbm-10.30/converter/ppm/ppmtoxpm.c.security 2005-10-07 09:01:00.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtoxpm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/ppmtoxpm.c.security 2005-12-21 17:50:01.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtoxpm.c 2005-12-30 10:44:51.000000000 +0100 @@ -195,6 +195,7 @@ genNumstr(unsigned int const input, int unsigned int i; @@ -1024,17 +1017,17 @@ if (!(str = (char *) malloc(digits + 1))) pm_error("out of memory"); -@@ -307,6 +308,7 @@ genCmap(colorhist_vector const chv, +@@ -312,6 +313,7 @@ genCmap(colorhist_vector const chv, unsigned int charsPerPixel; - unsigned int xppMaxval; + unsigned int xpmMaxval; + if (includeTransparent) overflow_add(ncolors, 1); MALLOCARRAY(cmap, cmapSize); if (cmapP == NULL) pm_error("Out of memory allocating %u bytes for a color map.", ---- netpbm-10.30/converter/ppm/ppmtopjxl.c.security 2003-02-22 23:04:36.000000000 +0100 -+++ netpbm-10.30/converter/ppm/ppmtopjxl.c 2005-10-21 11:08:57.000000000 +0200 -@@ -273,6 +273,8 @@ main(argc, argv) +--- netpbm-10.31/converter/ppm/ppmtopjxl.c.security 2005-12-22 09:54:12.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtopjxl.c 2005-12-30 10:44:51.000000000 +0100 +@@ -274,6 +274,8 @@ main(argc, argv) pm_error("image too large; reduce with ppmscale"); if (maxval > PCL_MAXVAL) pm_error("color range too large; reduce with ppmcscale"); @@ -1043,7 +1036,7 @@ /* Figure out the colormap. */ fprintf( stderr, "(Computing colormap..." ); fflush( stderr ); -@@ -293,6 +295,8 @@ main(argc, argv) +@@ -294,6 +296,8 @@ main(argc, argv) case 0: /* direct mode (no palette) */ bpp = bitsperpixel(maxval); /* bits per pixel */ bpg = bpp; bpb = bpp; @@ -1052,7 +1045,7 @@ bpp = (bpp*3+7)>>3; /* bytes per pixel now */ bpr = (bpp<<3)-bpg-bpb; bpp *= cols; /* bytes per row now */ -@@ -302,9 +306,13 @@ main(argc, argv) +@@ -303,9 +307,13 @@ main(argc, argv) case 3: case 7: pclindex++; default: bpp = 8/pclindex; @@ -1066,8 +1059,8 @@ if ((inrow = (char *)malloc((unsigned)bpp)) == NULL || (outrow = (char *)malloc((unsigned)bpp*2)) == NULL || (runcnt = (signed char *)malloc((unsigned)bpp)) == NULL) ---- netpbm-10.30/converter/ppm/yuvtoppm.c.security 2003-07-06 22:32:09.000000000 +0200 -+++ netpbm-10.30/converter/ppm/yuvtoppm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/yuvtoppm.c.security 2003-07-06 22:32:09.000000000 +0200 ++++ netpbm-10.31/converter/ppm/yuvtoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -72,6 +72,7 @@ main(argc, argv) ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0); @@ -1076,16 +1069,16 @@ MALLOCARRAY(yuvbuf, (cols+1)/2); if (yuvbuf == NULL) pm_error("Unable to allocate YUV buffer for %d columns.", cols); ---- netpbm-10.30/converter/ppm/picttoppm.c.security 2005-10-07 09:02:34.000000000 +0200 -+++ netpbm-10.30/converter/ppm/picttoppm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/picttoppm.c.security 2005-12-22 09:51:46.000000000 +0100 ++++ netpbm-10.31/converter/ppm/picttoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -1,3 +1,5 @@ +#error "Unfixable. Don't ship me" + /* * picttoppm.c -- convert a MacIntosh PICT file to PPM format. * ---- netpbm-10.30/converter/ppm/ppmtowinicon.c.security 2005-10-07 08:14:24.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtowinicon.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/ppmtowinicon.c.security 2005-10-07 08:14:24.000000000 +0200 ++++ netpbm-10.31/converter/ppm/ppmtowinicon.c 2005-12-30 10:44:51.000000000 +0100 @@ -12,6 +12,7 @@ #include @@ -1129,8 +1122,8 @@ entry->size_in_bytes = xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count); if (verbose) ---- netpbm-10.30/converter/ppm/xpmtoppm.c.security 2005-10-07 08:59:22.000000000 +0200 -+++ netpbm-10.30/converter/ppm/xpmtoppm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/ppm/xpmtoppm.c.security 2005-10-07 08:59:22.000000000 +0200 ++++ netpbm-10.31/converter/ppm/xpmtoppm.c 2005-12-30 10:44:51.000000000 +0100 @@ -700,6 +700,7 @@ ReadXPMFile(FILE * const stream, int * c &ncolors, colorsP, &ptab); *transparentP = -1; /* No transparency in version 1 */ @@ -1139,9 +1132,9 @@ totalpixels = *widthP * *heightP; MALLOCARRAY(*dataP, totalpixels); if (*dataP == NULL) ---- netpbm-10.30/converter/ppm/ppmtoeyuv.c.security 2005-06-06 23:10:13.000000000 +0200 -+++ netpbm-10.30/converter/ppm/ppmtoeyuv.c 2005-10-21 11:08:57.000000000 +0200 -@@ -113,6 +113,7 @@ create_multiplication_tables(const pixva +--- netpbm-10.31/converter/ppm/ppmtoeyuv.c.security 2005-12-22 09:53:14.000000000 +0100 ++++ netpbm-10.31/converter/ppm/ppmtoeyuv.c 2005-12-30 10:44:51.000000000 +0100 +@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva int index; @@ -1149,8 +1142,8 @@ MALLOCARRAY_NOFAIL(mult299 , maxval+1); MALLOCARRAY_NOFAIL(mult587 , maxval+1); MALLOCARRAY_NOFAIL(mult114 , maxval+1); ---- netpbm-10.30/converter/pbm/mgrtopbm.c.security 2005-02-20 20:58:25.000000000 +0100 -+++ netpbm-10.30/converter/pbm/mgrtopbm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/mgrtopbm.c.security 2005-02-20 20:58:25.000000000 +0100 ++++ netpbm-10.31/converter/pbm/mgrtopbm.c 2005-12-30 10:44:51.000000000 +0100 @@ -68,6 +68,8 @@ getinit(FILE * const file, if (head.h_high < ' ' || head.l_high < ' ') pm_error("Invalid width field in MGR header"); @@ -1160,8 +1153,8 @@ *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; ---- netpbm-10.30/converter/pbm/pbmtoascii.c.security 2002-07-30 17:42:53.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtoascii.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtoascii.c.security 2002-07-30 17:42:53.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtoascii.c 2005-12-30 10:44:51.000000000 +0100 @@ -115,9 +115,11 @@ char* argv[]; pm_usage( usage ); @@ -1174,8 +1167,8 @@ line = (char*) pm_allocrow( ccols + 1, sizeof(char) ); for ( row = 0; row < rows; row += gridy ) ---- netpbm-10.30/converter/pbm/pbmtox10bm.c.security 2005-10-07 09:10:10.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtox10bm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtox10bm.c.security 2005-10-07 09:10:10.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtox10bm.c 2005-12-30 10:44:51.000000000 +0100 @@ -57,6 +57,7 @@ main(int argc, char * argv[]) { bitrow = pbm_allocrow( cols ); @@ -1184,8 +1177,8 @@ padright = ( ( cols + 15 ) / 16 ) * 16 - cols; printf( "#define %s_width %d\n", name, cols ); ---- netpbm-10.30/converter/pbm/pbmtoppa/pbmtoppa.c.security 2005-04-30 18:45:07.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtoppa/pbmtoppa.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtoppa/pbmtoppa.c.security 2005-04-30 18:45:07.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtoppa/pbmtoppa.c 2005-12-30 10:44:51.000000000 +0100 @@ -441,6 +441,7 @@ main(int argc, char *argv[]) { pm_error("main(): unrecognized parameter '%s'", argv[argn]); } @@ -1194,8 +1187,8 @@ Pwidth=(Width+7)/8; printer.fptr=out; ---- netpbm-10.30/converter/pbm/pbmtoppa/pbm.c.security 2000-06-01 19:20:30.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtoppa/pbm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtoppa/pbm.c.security 2000-06-01 19:20:30.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtoppa/pbm.c 2005-12-30 10:44:51.000000000 +0100 @@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned return 0; @@ -1214,8 +1207,8 @@ memcpy (pbm->revdata, data, (pbm->width+7)/8); pbm->current_line--; } ---- netpbm-10.30/converter/pbm/ybmtopbm.c.security 1993-10-04 10:10:35.000000000 +0100 -+++ netpbm-10.30/converter/pbm/ybmtopbm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/ybmtopbm.c.security 1993-10-04 10:10:35.000000000 +0100 ++++ netpbm-10.31/converter/pbm/ybmtopbm.c 2005-12-30 10:44:51.000000000 +0100 @@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad pm_error( "EOF / read error" ); @@ -1224,8 +1217,8 @@ *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP; bitsperitem = 0; } ---- netpbm-10.30/converter/pbm/pbmtolj.c.security 2005-07-21 18:04:48.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtolj.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtolj.c.security 2005-07-21 18:04:48.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtolj.c 2005-12-30 10:44:51.000000000 +0100 @@ -119,7 +119,11 @@ parseCommandLine(int argc, char ** argv, static void allocateBuffers(unsigned int const cols) { @@ -1238,8 +1231,8 @@ packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1; deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10; ---- netpbm-10.30/converter/pbm/pbmto4425.c.security 2005-10-07 09:13:08.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmto4425.c 2005-10-21 11:57:16.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmto4425.c.security 2005-10-07 09:13:08.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmto4425.c 2005-12-30 10:44:51.000000000 +0100 @@ -2,6 +2,7 @@ #include "nstring.h" @@ -1257,8 +1250,8 @@ if(vmap == NULL) { pm_error( "Cannot allocate memory" ); ---- netpbm-10.30/converter/pbm/icontopbm.c.security 2005-10-07 09:14:45.000000000 +0200 -+++ netpbm-10.30/converter/pbm/icontopbm.c 2005-10-21 11:55:50.000000000 +0200 +--- netpbm-10.31/converter/pbm/icontopbm.c.security 2005-10-07 09:14:45.000000000 +0200 ++++ netpbm-10.31/converter/pbm/icontopbm.c 2005-12-30 10:44:51.000000000 +0100 @@ -11,6 +11,7 @@ */ @@ -1279,8 +1272,8 @@ data_length = BitmapSize( *widthP, *heightP ); *dataP = (short unsigned int *) malloc( data_length ); if ( *dataP == NULL ) ---- netpbm-10.30/converter/pbm/pbmtogem.c.security 2000-06-09 09:07:05.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtogem.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtogem.c.security 2000-06-09 09:07:05.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtogem.c 2005-12-30 10:44:51.000000000 +0100 @@ -123,6 +123,7 @@ putinit (rows, cols) bitsperitem = 0; bitshift = 7; @@ -1289,9 +1282,9 @@ outmax = (cols + 7) / 8; outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); ---- netpbm-10.30/converter/pbm/pbmtogo.c.security 2005-08-27 20:26:12.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtogo.c 2005-10-21 11:08:57.000000000 +0200 -@@ -90,6 +90,7 @@ main( argc, argv ) +--- netpbm-10.31/converter/pbm/pbmtogo.c.security 2005-12-22 09:45:07.000000000 +0100 ++++ netpbm-10.31/converter/pbm/pbmtogo.c 2005-12-30 10:44:51.000000000 +0100 +@@ -91,6 +91,7 @@ main( argc, argv ) bitrow = pbm_allocrow(cols); /* Round cols up to the nearest multiple of 8. */ @@ -1299,8 +1292,8 @@ rucols = ( cols + 7 ) / 8; bytesperrow = rucols; /* GraphOn uses bytes */ rucols = rucols * 8; ---- netpbm-10.30/converter/pbm/thinkjettopbm.l.security 2005-01-02 23:39:18.000000000 +0100 -+++ netpbm-10.30/converter/pbm/thinkjettopbm.l 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/thinkjettopbm.l.security 2005-01-02 23:39:18.000000000 +0100 ++++ netpbm-10.31/converter/pbm/thinkjettopbm.l 2005-12-30 10:44:51.000000000 +0100 @@ -94,7 +94,9 @@ DIG [0-9] \033\*b{DIG}+W { int l; @@ -1320,8 +1313,8 @@ pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0); packed_bitrow = malloc(maxRowLength); ---- netpbm-10.30/converter/pbm/pbmtoxbm.c.security 2005-10-07 09:08:17.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtoxbm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtoxbm.c.security 2005-10-07 09:08:17.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtoxbm.c 2005-12-30 10:44:51.000000000 +0100 @@ -100,6 +100,7 @@ main(int argc, char * argv[]) { bitrow = pbm_allocrow(cols); @@ -1330,8 +1323,8 @@ padright = ((cols + 7)/8) * 8 - cols; printf("#define %s_width %d\n", name, cols); ---- netpbm-10.30/converter/pbm/mdatopbm.c.security 2005-08-15 09:01:25.000000000 +0200 -+++ netpbm-10.30/converter/pbm/mdatopbm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/mdatopbm.c.security 2005-08-15 09:01:25.000000000 +0200 ++++ netpbm-10.31/converter/pbm/mdatopbm.c 2005-12-30 10:44:51.000000000 +0100 @@ -245,10 +245,13 @@ main(int argc, char **argv) { pm_readlittleshort(infile, &yy); nInCols = yy; } @@ -1347,8 +1340,8 @@ data = pbm_allocarray(nOutCols, nOutRows); ---- netpbm-10.30/converter/pbm/pbmtocmuwm.c.security 1993-10-04 10:10:46.000000000 +0100 -+++ netpbm-10.30/converter/pbm/pbmtocmuwm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtocmuwm.c.security 1993-10-04 10:10:46.000000000 +0100 ++++ netpbm-10.31/converter/pbm/pbmtocmuwm.c 2005-12-30 10:44:51.000000000 +0100 @@ -43,6 +43,7 @@ main( argc, argv ) bitrow = pbm_allocrow( cols ); @@ -1357,8 +1350,8 @@ padright = ( ( cols + 7 ) / 8 ) * 8 - cols; putinit( rows, cols ); ---- netpbm-10.30/converter/pbm/pbmtomda.c.security 2005-08-15 09:01:50.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtomda.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtomda.c.security 2005-08-15 09:01:50.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtomda.c 2005-12-30 10:44:51.000000000 +0100 @@ -179,6 +179,7 @@ int main(int argc, char **argv) nOutRowsUnrounded = bScale ? nInRows/2 : nInRows; @@ -1367,8 +1360,8 @@ nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4; /* MDA wants rows a multiple of 4 */ nOutCols = nInCols / 8; ---- netpbm-10.30/converter/pbm/pbmtozinc.c.security 2005-10-07 09:08:07.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtozinc.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtozinc.c.security 2005-10-07 09:08:07.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtozinc.c 2005-12-30 10:44:51.000000000 +0100 @@ -65,6 +65,7 @@ main(int argc, char * argv[]) { bitrow = pbm_allocrow( cols ); @@ -1377,8 +1370,8 @@ padright = ( ( cols + 15 ) / 16 ) * 16 - cols; printf( "USHORT %s[] = {\n",name); ---- netpbm-10.30/converter/pbm/pbmtoicon.c.security 2002-07-30 17:47:48.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtoicon.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtoicon.c.security 2002-07-30 17:47:48.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtoicon.c 2005-12-30 10:44:51.000000000 +0100 @@ -42,6 +42,7 @@ main( argc, argv ) bitrow = pbm_allocrow( cols ); @@ -1387,8 +1380,8 @@ pad = ( ( cols + 15 ) / 16 ) * 16 - cols; padleft = pad / 2; padright = pad - padleft; ---- netpbm-10.30/converter/pbm/pbmtomacp.c.security 2002-09-06 18:04:22.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pbmtomacp.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtomacp.c.security 2002-09-06 18:04:22.000000000 +0200 ++++ netpbm-10.31/converter/pbm/pbmtomacp.c 2005-12-30 10:44:51.000000000 +0100 @@ -104,6 +104,7 @@ char *argv[]; if( !lflg ) left = 0; @@ -1406,8 +1399,8 @@ if( bflg ) { if( bottom - top >= MAX_LINES ) bottom = top + MAX_LINES - 1; ---- netpbm-10.30/converter/pbm/pbmtomgr.c.security 1993-10-04 10:10:50.000000000 +0100 -+++ netpbm-10.30/converter/pbm/pbmtomgr.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtomgr.c.security 1993-10-04 10:10:50.000000000 +0100 ++++ netpbm-10.31/converter/pbm/pbmtomgr.c 2005-12-30 10:44:51.000000000 +0100 @@ -43,6 +43,7 @@ main( argc, argv ) bitrow = pbm_allocrow( cols ); @@ -1416,8 +1409,8 @@ padright = ( ( cols + 7 ) / 8 ) * 8 - cols; putinit( rows, cols ); ---- netpbm-10.30/converter/pbm/pbmto10x.c.security 2004-03-20 05:23:36.000000000 +0100 -+++ netpbm-10.30/converter/pbm/pbmto10x.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmto10x.c.security 2004-03-20 05:23:36.000000000 +0100 ++++ netpbm-10.31/converter/pbm/pbmto10x.c 2005-12-30 10:44:51.000000000 +0100 @@ -162,7 +162,7 @@ main(int argc, char * argv[]) { res_60x72(); @@ -1427,8 +1420,8 @@ } ---- netpbm-10.30/converter/pbm/pbmtoybm.c.security 1993-10-04 10:10:43.000000000 +0100 -+++ netpbm-10.30/converter/pbm/pbmtoybm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/pbm/pbmtoybm.c.security 1993-10-04 10:10:43.000000000 +0100 ++++ netpbm-10.31/converter/pbm/pbmtoybm.c 2005-12-30 10:44:51.000000000 +0100 @@ -45,6 +45,7 @@ main( argc, argv ) bitrow = pbm_allocrow( cols ); @@ -1437,9 +1430,9 @@ padright = ( ( cols + 15 ) / 16 ) * 16 - cols; putinit( cols, rows ); ---- netpbm-10.30/converter/pbm/pktopbm.c.security 2005-10-07 09:07:14.000000000 +0200 -+++ netpbm-10.30/converter/pbm/pktopbm.c 2005-10-21 11:08:57.000000000 +0200 -@@ -276,6 +276,7 @@ main(int argc, char *argv[]) { +--- netpbm-10.31/converter/pbm/pktopbm.c.security 2005-12-22 09:48:08.000000000 +0100 ++++ netpbm-10.31/converter/pbm/pktopbm.c 2005-12-30 10:44:51.000000000 +0100 +@@ -277,6 +277,7 @@ main(int argc, char *argv[]) { if (flagbyte == 7) { /* long form preamble */ integer packetlength = get32() ; /* character packet length */ car = get32() ; /* character number */ @@ -1447,8 +1440,8 @@ endofpacket = packetlength + pktopbm_pkloc; /* calculate end of packet */ if ((car >= MAXPKCHAR) || !filename[car]) { ---- netpbm-10.30/converter/other/pngtopnm.c.security 2005-09-17 23:52:51.000000000 +0200 -+++ netpbm-10.30/converter/other/pngtopnm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/pngtopnm.c.security 2005-10-29 19:40:03.000000000 +0200 ++++ netpbm-10.31/converter/other/pngtopnm.c 2005-12-30 10:44:51.000000000 +0100 @@ -985,19 +985,24 @@ convertpng(FILE * const ifp, pm_error ("couldn't allocate space for image"); } @@ -1481,9 +1474,9 @@ for (y = 0 ; y < info_ptr->height ; y++) { png_image[y] = malloc (linesize); ---- netpbm-10.30/converter/other/tifftopnm.c.security 2005-10-07 08:32:30.000000000 +0200 -+++ netpbm-10.30/converter/other/tifftopnm.c 2005-10-21 11:08:57.000000000 +0200 -@@ -742,7 +742,8 @@ convertRasterByRows(FILE * const +--- netpbm-10.31/converter/other/tifftopnm.c.security 2005-10-29 19:59:42.000000000 +0200 ++++ netpbm-10.31/converter/other/tifftopnm.c 2005-12-30 10:44:51.000000000 +0100 +@@ -747,7 +747,8 @@ convertRasterByRows(FILE * const if (scanbuf == NULL) pm_error("can't allocate memory for scanline buffer"); @@ -1493,8 +1486,8 @@ if (samplebuf == NULL) pm_error ("can't allocate memory for row buffer"); ---- netpbm-10.30/converter/other/pnmtoddif.c.security 2002-07-30 19:09:13.000000000 +0200 -+++ netpbm-10.30/converter/other/pnmtoddif.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/pnmtoddif.c.security 2002-07-30 19:09:13.000000000 +0200 ++++ netpbm-10.31/converter/other/pnmtoddif.c 2005-12-30 10:44:51.000000000 +0100 @@ -484,6 +484,7 @@ int main(int argc, char *argv[]) switch (PNM_FORMAT_TYPE(format)) { case PBM_TYPE: @@ -1511,9 +1504,9 @@ ip.bytes_per_line = 3 * cols; ip.bits_per_pixel = 24; ip.spectral = 5; ---- netpbm-10.30/converter/other/xwdtopnm.c.security 2005-10-07 08:32:02.000000000 +0200 -+++ netpbm-10.30/converter/other/xwdtopnm.c 2005-10-21 11:08:57.000000000 +0200 -@@ -285,6 +285,9 @@ processX10Header(X10WDFileHeader * cons +--- netpbm-10.31/converter/other/xwdtopnm.c.security 2005-12-15 04:45:59.000000000 +0100 ++++ netpbm-10.31/converter/other/xwdtopnm.c 2005-12-30 10:44:51.000000000 +0100 +@@ -253,6 +253,9 @@ processX10Header(X10WDFileHeader * cons *colorsP = pnm_allocrow( 2 ); PNM_ASSIGN1( (*colorsP)[0], 0 ); PNM_ASSIGN1( (*colorsP)[1], *maxvalP ); @@ -1523,7 +1516,7 @@ *padrightP = ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width; *bits_per_itemP = 16; -@@ -294,9 +297,13 @@ processX10Header(X10WDFileHeader * cons +@@ -262,9 +265,13 @@ processX10Header(X10WDFileHeader * cons *formatP = PGM_TYPE; *visualclassP = StaticGray; *maxvalP = ( 1 << h10P->display_planes ) - 1; @@ -1537,7 +1530,7 @@ *padrightP = ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width; *bits_per_itemP = 16; -@@ -615,6 +622,7 @@ processX11Header(X11WDFileHeader * cons +@@ -583,6 +590,7 @@ processX11Header(X11WDFileHeader * cons *colsP = h11FixedP->pixmap_width; *rowsP = h11FixedP->pixmap_height; @@ -1545,8 +1538,8 @@ *padrightP = h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel - h11FixedP->pixmap_width; ---- netpbm-10.30/converter/other/pnmtorle.c.security 2005-05-22 19:01:43.000000000 +0200 -+++ netpbm-10.30/converter/other/pnmtorle.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/pnmtorle.c.security 2005-05-22 19:01:43.000000000 +0200 ++++ netpbm-10.31/converter/other/pnmtorle.c 2005-12-30 10:44:51.000000000 +0100 @@ -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, @@ -1556,8 +1549,8 @@ */ /* * pnmtorle - A program which will convert pbmplus (ppm or pgm) images ---- netpbm-10.30/converter/other/pnmtops.c.security 2005-10-07 08:45:02.000000000 +0200 -+++ netpbm-10.30/converter/other/pnmtops.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/pnmtops.c.security 2005-11-10 17:27:14.000000000 +0100 ++++ netpbm-10.31/converter/other/pnmtops.c 2005-12-30 10:44:51.000000000 +0100 @@ -184,16 +184,21 @@ parseCommandLine(int argc, char ** argv, cmdlineP->canturn = !noturn; cmdlineP->showpage = !noshowpage; @@ -1583,8 +1576,8 @@ cmdlineP->imageheight = 0; if (!cmdlineP->psfilter && ---- netpbm-10.30/converter/other/pnmtojpeg.c.security 2005-10-07 08:46:56.000000000 +0200 -+++ netpbm-10.30/converter/other/pnmtojpeg.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/pnmtojpeg.c.security 2005-10-07 08:46:56.000000000 +0200 ++++ netpbm-10.31/converter/other/pnmtojpeg.c 2005-12-30 10:44:51.000000000 +0100 @@ -587,6 +587,8 @@ compute_rescaling_array(JSAMPLE ** const const long half_maxval = maxval / 2; long val; @@ -1615,8 +1608,8 @@ (jpeg_scan_info *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, scan_info_size); ---- netpbm-10.30/converter/other/jpegtopnm.c.security 2005-10-07 08:57:11.000000000 +0200 -+++ netpbm-10.30/converter/other/jpegtopnm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/jpegtopnm.c.security 2005-10-07 08:57:11.000000000 +0200 ++++ netpbm-10.31/converter/other/jpegtopnm.c 2005-12-30 10:44:51.000000000 +0100 @@ -828,6 +828,7 @@ convertImage(FILE * /* Calculate output image dimensions so we can allocate space */ jpeg_calc_output_dimensions(cinfoP); @@ -1625,9 +1618,9 @@ jpegbuffer = ((*cinfoP->mem->alloc_sarray) ((j_common_ptr) cinfoP, JPOOL_IMAGE, cinfoP->output_width * cinfoP->output_components, ---- netpbm-10.30/converter/other/pbmtopgm.c.security 2004-09-18 05:15:02.000000000 +0200 -+++ netpbm-10.30/converter/other/pbmtopgm.c 2005-10-21 11:08:57.000000000 +0200 -@@ -45,6 +45,7 @@ main(int argc, char *argv[]) { +--- netpbm-10.31/converter/other/pbmtopgm.c.security 2005-12-03 18:42:41.000000000 +0100 ++++ netpbm-10.31/converter/other/pbmtopgm.c 2005-12-30 10:44:51.000000000 +0100 +@@ -47,6 +47,7 @@ main(int argc, char *argv[]) { "than the image height (%u rows)", height, rows); outrow = pgm_allocrow(cols) ; @@ -1635,8 +1628,8 @@ maxval = MIN(PGM_OVERALLMAXVAL, width*height); pgm_writepgminit(stdout, cols, rows, maxval, 0) ; ---- netpbm-10.30/converter/other/pnmtosgi.c.security 2003-07-10 06:04:07.000000000 +0200 -+++ netpbm-10.30/converter/other/pnmtosgi.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/pnmtosgi.c.security 2003-07-10 06:04:07.000000000 +0200 ++++ netpbm-10.31/converter/other/pnmtosgi.c 2005-12-30 10:44:51.000000000 +0100 @@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put } } @@ -1677,8 +1670,8 @@ len = rle_compress(temp, cols); /* writes result into rletemp */ channel[chan_no][row].length = len; MALLOCARRAY(p, len); ---- netpbm-10.30/converter/other/rletopnm.c.security 2005-10-16 21:47:36.000000000 +0200 -+++ netpbm-10.30/converter/other/rletopnm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/rletopnm.c.security 2005-11-13 22:40:02.000000000 +0100 ++++ netpbm-10.31/converter/other/rletopnm.c 2005-12-30 10:44:51.000000000 +0100 @@ -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, @@ -1688,8 +1681,8 @@ */ /* * rletopnm - A conversion program to convert from Utah's "rle" image format ---- netpbm-10.30/converter/other/sirtopnm.c.security 2002-01-04 18:22:45.000000000 +0100 -+++ netpbm-10.30/converter/other/sirtopnm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/sirtopnm.c.security 2002-01-04 18:22:45.000000000 +0100 ++++ netpbm-10.31/converter/other/sirtopnm.c 2005-12-30 10:44:51.000000000 +0100 @@ -69,6 +69,7 @@ char* argv[]; } break; @@ -1698,8 +1691,8 @@ picsize = cols * rows * 3; planesize = cols * rows; if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) ---- netpbm-10.30/converter/other/gemtopnm.c.security 2005-08-27 19:30:45.000000000 +0200 -+++ netpbm-10.30/converter/other/gemtopnm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/gemtopnm.c.security 2005-08-27 19:30:45.000000000 +0200 ++++ netpbm-10.31/converter/other/gemtopnm.c 2005-12-30 10:44:51.000000000 +0100 @@ -106,6 +106,7 @@ main(argc, argv) pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 ); @@ -1708,8 +1701,8 @@ { /* allocate input row data structure */ int plane; ---- netpbm-10.30/converter/other/sgitopnm.c.security 2005-08-27 19:33:09.000000000 +0200 -+++ netpbm-10.30/converter/other/sgitopnm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/converter/other/sgitopnm.c.security 2005-08-27 19:33:09.000000000 +0200 ++++ netpbm-10.31/converter/other/sgitopnm.c 2005-12-30 10:44:51.000000000 +0100 @@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc if (ochan < 0) { @@ -1729,8 +1722,8 @@ for( channel = 0; channel < maxchannel; channel++ ) { #ifdef DEBUG ---- netpbm-10.30/analyzer/pgmhist.c.security 2003-07-06 21:23:19.000000000 +0200 -+++ netpbm-10.30/analyzer/pgmhist.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/analyzer/pgmhist.c.security 2003-07-06 21:23:19.000000000 +0200 ++++ netpbm-10.31/analyzer/pgmhist.c 2005-12-30 10:44:51.000000000 +0100 @@ -45,6 +45,7 @@ main( argc, argv ) grayrow = pgm_allocrow( cols ); @@ -1739,9 +1732,9 @@ MALLOCARRAY(hist, maxval + 1); MALLOCARRAY(rcount, maxval + 1); if ( hist == NULL || rcount == NULL ) ---- netpbm-10.30/analyzer/pgmtexture.c.security 2005-10-05 18:37:49.000000000 +0200 -+++ netpbm-10.30/analyzer/pgmtexture.c 2005-10-21 11:54:17.000000000 +0200 -@@ -78,6 +78,9 @@ vector (int nl, int nh) +--- netpbm-10.31/analyzer/pgmtexture.c.security 2005-12-22 10:17:08.000000000 +0100 ++++ netpbm-10.31/analyzer/pgmtexture.c 2005-12-30 10:44:51.000000000 +0100 +@@ -79,6 +79,9 @@ vector (int nl, int nh) { float *v; @@ -1751,7 +1744,7 @@ MALLOCARRAY(v, (unsigned) (nh - nl + 1)); if (v == NULL) pm_error("Unable to allocate memory for a vector."); -@@ -94,6 +97,9 @@ matrix (int nrl, int nrh, int ncl, int n +@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n float **m; /* allocate pointers to rows */ @@ -1761,7 +1754,7 @@ MALLOCARRAY(m, (unsigned) (nrh - nrl + 1)); if (m == NULL) pm_error("Unable to allocate memory for a matrix."); -@@ -101,6 +107,9 @@ matrix (int nrl, int nrh, int ncl, int n +@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n m -= ncl; /* allocate rows and set pointers to them */ @@ -1771,8 +1764,8 @@ for (i = nrl; i <= nrh; i++) { MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); ---- netpbm-10.30/lib/libpbm1.c.security 2005-02-05 19:41:54.000000000 +0100 -+++ netpbm-10.30/lib/libpbm1.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/lib/libpbm1.c.security 2005-02-05 19:41:54.000000000 +0100 ++++ netpbm-10.31/lib/libpbm1.c 2005-12-30 10:44:51.000000000 +0100 @@ -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)); @@ -1781,9 +1774,9 @@ pm_check(file, check_type, need_raster_size, retval_p); } } ---- netpbm-10.30/lib/pm.h.security 2005-10-07 08:18:07.000000000 +0200 -+++ netpbm-10.30/lib/pm.h 2005-10-21 11:08:57.000000000 +0200 -@@ -342,4 +342,10 @@ pm_arg0toprogname(const char arg0[]); +--- netpbm-10.31/lib/pm.h.security 2005-12-03 17:20:19.000000000 +0100 ++++ netpbm-10.31/lib/pm.h 2005-12-30 10:44:51.000000000 +0100 +@@ -325,4 +325,10 @@ pm_arg0toprogname(const char arg0[]); #endif @@ -1794,9 +1787,9 @@ +void overflow_add(int, int); + #endif ---- netpbm-10.30/lib/libpammap.c.security 2005-09-23 18:08:17.000000000 +0200 -+++ netpbm-10.30/lib/libpammap.c 2005-10-21 11:08:57.000000000 +0200 -@@ -101,6 +101,8 @@ allocTupleIntListItem(struct pam * const +--- netpbm-10.31/lib/libpammap.c.security 2005-12-03 18:01:03.000000000 +0100 ++++ netpbm-10.31/lib/libpammap.c 2005-12-30 10:44:51.000000000 +0100 +@@ -102,6 +102,8 @@ allocTupleIntListItem(struct pam * const */ struct tupleint_list_item * retval; @@ -1805,9 +1798,9 @@ unsigned int const size = sizeof(*retval) - sizeof(retval->tupleint.tuple) + pamP->depth * sizeof(sample); ---- netpbm-10.30/lib/libpam.c.security 2005-10-10 17:42:51.000000000 +0200 -+++ netpbm-10.30/lib/libpam.c 2005-10-21 11:08:57.000000000 +0200 -@@ -272,7 +272,8 @@ allocPamRow(const struct pam * const pam +--- netpbm-10.31/lib/libpam.c.security 2005-12-03 17:59:50.000000000 +0100 ++++ netpbm-10.31/lib/libpam.c 2005-12-30 10:44:51.000000000 +0100 +@@ -274,7 +274,8 @@ allocPamRow(const struct pam * const pam int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); tuple * tuplerow; @@ -1817,8 +1810,8 @@ if (tuplerow != NULL) { /* Now we initialize the pointers to the individual tuples ---- netpbm-10.30/lib/libpm.c.security 2005-10-09 03:16:17.000000000 +0200 -+++ netpbm-10.30/lib/libpm.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/lib/libpm.c.security 2005-12-03 17:52:40.000000000 +0100 ++++ netpbm-10.31/lib/libpm.c 2005-12-30 10:44:51.000000000 +0100 @@ -36,6 +36,7 @@ /* This makes the the x64() functions available on AIX */ @@ -1827,7 +1820,7 @@ #include #include #include -@@ -155,7 +156,7 @@ char* +@@ -156,7 +157,7 @@ char* pm_allocrow(int const cols, int const size) { char * itrow; @@ -1836,7 +1829,7 @@ if ( itrow == NULL ) pm_error( "out of memory allocating a row" ); return itrow; -@@ -195,7 +196,7 @@ pm_allocarray(int const cols, int const +@@ -196,7 +197,7 @@ pm_allocarray(int const cols, int const if (rowIndex == NULL) pm_error("out of memory allocating row index (%u rows) for an array", rows); @@ -1845,7 +1838,7 @@ if (rowheap == NULL) { /* We couldn't get the whole heap in one block, so try fragmented format. -@@ -1341,4 +1342,53 @@ pm_check(FILE * const file +@@ -1342,4 +1343,53 @@ pm_check(FILE * const file } @@ -1899,16 +1892,16 @@ + return realloc(a, b*c); +} ---- netpbm-10.30/lib/libpbmvms.c.security 2005-08-27 19:24:54.000000000 +0200 -+++ netpbm-10.30/lib/libpbmvms.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/lib/libpbmvms.c.security 2005-08-27 19:24:54.000000000 +0200 ++++ netpbm-10.31/lib/libpbmvms.c 2005-12-30 10:44:51.000000000 +0100 @@ -1,3 +1,5 @@ +#warning "NOT AUDITED" + /*************************************************************************** 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.30/editor/pbmreduce.c.security 2003-07-06 21:41:49.000000000 +0200 -+++ netpbm-10.30/editor/pbmreduce.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pbmreduce.c.security 2003-07-06 21:41:49.000000000 +0200 ++++ netpbm-10.31/editor/pbmreduce.c 2005-12-30 10:44:51.000000000 +0100 @@ -93,6 +93,7 @@ main( argc, argv ) if ( halftone == QT_FS ) { @@ -1917,8 +1910,8 @@ MALLOCARRAY(thiserr, newcols + 2); MALLOCARRAY(nexterr, newcols + 2); if ( thiserr == NULL || nexterr == NULL ) ---- netpbm-10.30/editor/pnmindex.csh.security 2000-09-14 07:37:35.000000000 +0200 -+++ netpbm-10.30/editor/pnmindex.csh 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmindex.csh.security 2000-09-14 07:37:35.000000000 +0200 ++++ netpbm-10.31/editor/pnmindex.csh 2005-12-30 10:44:51.000000000 +0100 @@ -1,5 +1,8 @@ #!/bin/csh -f # @@ -1928,8 +1921,8 @@ # pnmindex - build a visual index of a bunch of anymaps # # Copyright (C) 1991 by Jef Poskanzer. ---- netpbm-10.30/editor/pnmscalefixed.c.security 2002-07-30 19:52:49.000000000 +0200 -+++ netpbm-10.30/editor/pnmscalefixed.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmscalefixed.c.security 2002-07-30 19:52:49.000000000 +0200 ++++ netpbm-10.31/editor/pnmscalefixed.c 2005-12-30 10:44:51.000000000 +0100 @@ -209,6 +209,8 @@ compute_output_dimensions(const struct c const int rows, const int cols, int * newrowsP, int * newcolsP) { @@ -1958,8 +1951,8 @@ sxscale = SCALE * newcols / cols; syscale = SCALE * newrows / rows; ---- netpbm-10.30/editor/pnmcut.c.security 2002-07-30 19:47:37.000000000 +0200 -+++ netpbm-10.30/editor/pnmcut.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmcut.c.security 2002-07-30 19:47:37.000000000 +0200 ++++ netpbm-10.31/editor/pnmcut.c 2005-12-30 10:44:51.000000000 +0100 @@ -373,6 +373,7 @@ main(int argc, char *argv[]) { toprow, leftcol, bottomrow, rightcol); } @@ -1968,8 +1961,8 @@ output_cols = rightcol-leftcol+1; output_row = pnm_allocrow(output_cols); ---- netpbm-10.30/editor/pamoil.c.security 2005-08-15 09:05:44.000000000 +0200 -+++ netpbm-10.30/editor/pamoil.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pamoil.c.security 2005-08-15 09:05:44.000000000 +0200 ++++ netpbm-10.31/editor/pamoil.c 2005-12-30 10:44:51.000000000 +0100 @@ -112,6 +112,7 @@ main(int argc, char *argv[] ) { tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type)); pm_close(ifp); @@ -1978,8 +1971,8 @@ MALLOCARRAY(hist, inpam.maxval + 1); if (hist == NULL) pm_error("Unable to allocate memory for histogram."); ---- netpbm-10.30/editor/pnmremap.c.security 2005-10-17 01:27:13.000000000 +0200 -+++ netpbm-10.30/editor/pnmremap.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmremap.c.security 2005-11-19 18:46:29.000000000 +0100 ++++ netpbm-10.31/editor/pnmremap.c 2005-12-30 10:44:51.000000000 +0100 @@ -281,6 +281,7 @@ initFserr(struct pam * const pamP, unsigned int const fserrSize = pamP->width + 2; @@ -1996,8 +1989,8 @@ for (col = 0; col < pamP->width + 2; ++col) { unsigned int plane; for (plane = 0; plane < pamP->depth; ++plane) ---- netpbm-10.30/editor/pnmpad.c.security 2005-05-22 20:30:30.000000000 +0200 -+++ netpbm-10.30/editor/pnmpad.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmpad.c.security 2005-05-22 20:30:30.000000000 +0200 ++++ netpbm-10.31/editor/pnmpad.c 2005-12-30 10:44:51.000000000 +0100 @@ -358,6 +358,8 @@ main(int argc, char ** argv) { computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad); @@ -2007,8 +2000,8 @@ newcols = cols + lpad + rpad; xelrow = pnm_allocrow(newcols); bgrow = pnm_allocrow(newcols); ---- netpbm-10.30/editor/pamcut.c.security 2005-08-15 00:35:26.000000000 +0200 -+++ netpbm-10.30/editor/pamcut.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pamcut.c.security 2005-08-15 00:35:26.000000000 +0200 ++++ netpbm-10.31/editor/pamcut.c 2005-12-30 10:44:51.000000000 +0100 @@ -510,6 +510,8 @@ main(int argc, char *argv[]) { outpam.width = rightcol-leftcol+1; outpam.height = bottomrow-toprow+1; @@ -2018,8 +2011,8 @@ pnm_writepaminit(&outpam); /* Write out top padding */ ---- netpbm-10.30/editor/pbmlife.c.security 1993-10-04 10:10:37.000000000 +0100 -+++ netpbm-10.30/editor/pbmlife.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pbmlife.c.security 1993-10-04 10:10:37.000000000 +0100 ++++ netpbm-10.31/editor/pbmlife.c 2005-12-30 10:44:51.000000000 +0100 @@ -54,7 +54,7 @@ char* argv[]; prevrow = thisrow; thisrow = nextrow; @@ -2029,8 +2022,8 @@ pbm_readpbmrow( ifp, nextrow, cols, format ); for ( col = 0; col < cols; ++col ) ---- netpbm-10.30/editor/pnmrotate.c.security 2005-08-15 08:17:25.000000000 +0200 -+++ netpbm-10.30/editor/pnmrotate.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmrotate.c.security 2005-12-20 00:14:33.000000000 +0100 ++++ netpbm-10.31/editor/pnmrotate.c 2005-12-30 10:44:51.000000000 +0100 @@ -13,6 +13,7 @@ #define _XOPEN_SOURCE /* get M_PI in math.h */ @@ -2058,9 +2051,9 @@ newcols = newrows * xshearfac + tempcols + 0.999999 - 2 * x2shearjunk; direction = cmdline.angle > 0 ? COUNTERCLOCKWISE : CLOCKWISE; ---- netpbm-10.30/editor/pnmpaste.c.security 2002-07-30 19:47:35.000000000 +0200 -+++ netpbm-10.30/editor/pnmpaste.c 2005-10-21 11:08:57.000000000 +0200 -@@ -100,11 +100,16 @@ main( argc, argv ) +--- netpbm-10.31/editor/pnmpaste.c.security 2005-12-22 10:24:24.000000000 +0100 ++++ netpbm-10.31/editor/pnmpaste.c 2005-12-30 10:44:51.000000000 +0100 +@@ -101,11 +101,16 @@ main( argc, argv ) "y is too large -- the second anymap has only %d rows", rows2 ); @@ -2077,8 +2070,8 @@ if ( x + cols1 > cols2 ) pm_error( "x + width is too large by %d pixels", x + cols1 - cols2 ); if ( y + rows1 > rows2 ) ---- netpbm-10.30/editor/pbmclean.c.security 2005-02-27 17:33:57.000000000 +0100 -+++ netpbm-10.30/editor/pbmclean.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pbmclean.c.security 2005-02-27 17:33:57.000000000 +0100 ++++ netpbm-10.31/editor/pbmclean.c 2005-12-30 10:44:51.000000000 +0100 @@ -147,7 +147,7 @@ nextrow(FILE * const ifd, int const row, inrow[0] = inrow[1]; inrow[1] = inrow[2]; @@ -2088,8 +2081,8 @@ /* Read the "next" row in from the file. Allocate buffer if neeeded */ if (inrow[2] == NULL) inrow[2] = pbm_allocrow(cols); ---- netpbm-10.30/editor/ppmdither.c.security 2003-07-06 21:54:02.000000000 +0200 -+++ netpbm-10.30/editor/ppmdither.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/ppmdither.c.security 2003-07-06 21:54:02.000000000 +0200 ++++ netpbm-10.31/editor/ppmdither.c 2005-12-30 10:44:51.000000000 +0100 @@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim) (dith_dim * sizeof(int *)) + /* pointers */ (dith_dim * dith_dim * sizeof(int)); /* data */ @@ -2110,8 +2103,8 @@ 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.30/editor/pnmgamma.c.security 2005-04-25 01:05:48.000000000 +0200 -+++ netpbm-10.30/editor/pnmgamma.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmgamma.c.security 2005-04-25 01:05:48.000000000 +0200 ++++ netpbm-10.31/editor/pnmgamma.c 2005-12-30 10:44:51.000000000 +0100 @@ -282,6 +282,7 @@ createGammaTables(bool const ungamma, xelval **rtableP, xelval **gtableP, xelval **btableP) { @@ -2120,8 +2113,8 @@ MALLOCARRAY(*rtableP, maxval+1); MALLOCARRAY(*gtableP, maxval+1); MALLOCARRAY(*btableP, maxval+1); ---- netpbm-10.30/editor/pnmhisteq.c.security 2005-09-11 00:59:13.000000000 +0200 -+++ netpbm-10.30/editor/pnmhisteq.c 2005-10-21 11:38:13.000000000 +0200 +--- netpbm-10.31/editor/pnmhisteq.c.security 2005-09-11 00:59:13.000000000 +0200 ++++ netpbm-10.31/editor/pnmhisteq.c 2005-12-30 10:44:51.000000000 +0100 @@ -102,6 +102,7 @@ computeLuminosityHistogram(xel * const * unsigned int pixelCount; unsigned int * lumahist; @@ -2130,8 +2123,8 @@ MALLOCARRAY(lumahist, maxval + 1); if (lumahist == NULL) pm_error("Out of storage allocating array for %u histogram elements", ---- netpbm-10.30/editor/pnmshear.c.security 2005-08-15 08:17:16.000000000 +0200 -+++ netpbm-10.30/editor/pnmshear.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pnmshear.c.security 2005-08-15 08:17:16.000000000 +0200 ++++ netpbm-10.31/editor/pnmshear.c 2005-12-30 10:44:51.000000000 +0100 @@ -14,6 +14,7 @@ #include @@ -2152,8 +2145,8 @@ newcols = rows * shearfac + cols + 0.999999; pnm_writepnminit( stdout, newcols, rows, newmaxval, newformat, 0 ); ---- netpbm-10.30/editor/pbmpscale.c.security 2005-08-15 09:06:55.000000000 +0200 -+++ netpbm-10.30/editor/pbmpscale.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/editor/pbmpscale.c.security 2005-08-15 09:06:55.000000000 +0200 ++++ netpbm-10.31/editor/pbmpscale.c 2005-12-30 10:44:51.000000000 +0100 @@ -109,6 +109,7 @@ main(argc, argv) inrow[0] = inrow[1] = inrow[2] = NULL; pbm_readpbminit(ifd, &columns, &rows, &format) ; @@ -2162,8 +2155,8 @@ outrow = pbm_allocrow(columns*scale) ; MALLOCARRAY(flags, columns); if (flags == NULL) ---- netpbm-10.30/urt/scanargs.c.security 2003-01-08 20:38:25.000000000 +0100 -+++ netpbm-10.30/urt/scanargs.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/urt/scanargs.c.security 2003-01-08 20:38:25.000000000 +0100 ++++ netpbm-10.31/urt/scanargs.c 2005-12-30 10:44:51.000000000 +0100 @@ -38,6 +38,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -2184,8 +2177,8 @@ #if defined(c_plusplus) && !defined(USE_PROTOTYPES) #define USE_PROTOTYPES ---- netpbm-10.30/urt/rle.h.security 2005-10-16 23:44:55.000000000 +0200 -+++ netpbm-10.30/urt/rle.h 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/urt/rle.h.security 2005-10-16 23:44:55.000000000 +0200 ++++ netpbm-10.31/urt/rle.h 2005-12-30 10:44:51.000000000 +0100 @@ -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, @@ -2213,8 +2206,8 @@ /* Declare RLE library routines. */ ---- netpbm-10.30/urt/rle_open_f.c.security 2005-10-17 00:16:48.000000000 +0200 -+++ netpbm-10.30/urt/rle_open_f.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/urt/rle_open_f.c.security 2005-10-17 00:16:48.000000000 +0200 ++++ netpbm-10.31/urt/rle_open_f.c 2005-12-30 10:44:51.000000000 +0100 @@ -6,6 +6,9 @@ * University of Michigan * Date: 11/14/89 @@ -2246,8 +2239,8 @@ combuf = (char *)malloc( 20 + strlen( file_name ) ); if ( combuf == NULL ) { ---- netpbm-10.30/urt/rle_addhist.c.security 2005-10-17 00:15:58.000000000 +0200 -+++ netpbm-10.30/urt/rle_addhist.c 2005-10-21 11:23:38.000000000 +0200 +--- netpbm-10.31/urt/rle_addhist.c.security 2005-10-17 00:15:58.000000000 +0200 ++++ netpbm-10.31/urt/rle_addhist.c 2005-12-30 10:44:51.000000000 +0100 @@ -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, @@ -2292,8 +2285,8 @@ ++length; /*Cater for the null. */ MALLOCARRAY(newc, length); ---- netpbm-10.30/urt/rle_hdr.c.security 2005-10-17 00:16:33.000000000 +0200 -+++ netpbm-10.30/urt/rle_hdr.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/urt/rle_hdr.c.security 2005-10-17 00:16:33.000000000 +0200 ++++ netpbm-10.31/urt/rle_hdr.c 2005-12-30 10:44:51.000000000 +0100 @@ -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, @@ -2360,8 +2353,8 @@ size *= sizeof(char *); to_hdr->comments = (CONST_DECL char **)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); ---- netpbm-10.30/urt/README.security 2000-06-02 22:53:04.000000000 +0200 -+++ netpbm-10.30/urt/README 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/urt/README.security 2000-06-02 22:53:04.000000000 +0200 ++++ netpbm-10.31/urt/README 2005-12-30 10:44:51.000000000 +0100 @@ -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 @@ -2371,8 +2364,8 @@ +Removed pipe through and compress support (unsafe) + +Alan Cox ---- netpbm-10.30/urt/Runput.c.security 2005-10-16 23:36:29.000000000 +0200 -+++ netpbm-10.30/urt/Runput.c 2005-10-21 11:08:57.000000000 +0200 +--- netpbm-10.31/urt/Runput.c.security 2005-10-16 23:36:29.000000000 +0200 ++++ netpbm-10.31/urt/Runput.c 2005-12-30 10:44:51.000000000 +0100 @@ -17,6 +17,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -2405,8 +2398,8 @@ if ( h_cmap == NULL ) { fprintf( stderr, ---- netpbm-10.30/urt/rle_getrow.c.security 2005-10-16 23:47:53.000000000 +0200 -+++ netpbm-10.30/urt/rle_getrow.c 2005-10-21 11:32:32.000000000 +0200 +--- netpbm-10.31/urt/rle_getrow.c.security 2005-10-16 23:47:53.000000000 +0200 ++++ netpbm-10.31/urt/rle_getrow.c 2005-12-30 10:44:51.000000000 +0100 @@ -17,6 +17,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -2424,8 +2417,8 @@ evenlen = (comlen + 1) & ~1; /* make it even */ if ( evenlen ) { ---- netpbm-10.30/urt/rle_putcom.c.security 2005-10-07 18:01:42.000000000 +0200 -+++ netpbm-10.30/urt/rle_putcom.c 2005-10-21 11:34:46.000000000 +0200 +--- netpbm-10.31/urt/rle_putcom.c.security 2005-10-07 18:01:42.000000000 +0200 ++++ netpbm-10.31/urt/rle_putcom.c 2005-12-30 10:44:51.000000000 +0100 @@ -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, diff --git a/netpbm.spec b/netpbm.spec index 79fbf22..7f76049 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats. Name: netpbm -Version: 10.30 -Release: 2.1 +Version: 10.31 +Release: 1 License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -174,6 +174,11 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template %{_mandir}/man5/* %changelog +* Fri Dec 30 2005 Jindrich Novy 10.31-1 +- update to 10.31 +- update security patch +- regenerate man pages + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index 370341d..624c133 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -48c40649d090c65f344afb9f6792bcc6 netpbm-10.30.tar.bz2 -ad2ba0a739bc3948295e0c74c8da9e11 netpbmdoc-10.30.tar.bz2 +0399e7b78da0291369004f9c19761075 netpbmdoc-10.31.tar.bz2 +34910af6b21f0de0142876455f27ad88 netpbm-10.31.tar.bz2