Tue Nov 13 05:15:29 UTC 201820181113051529

d/python-setuptools-40.6.1-x86_64-1.txz:  Upgraded.
l/M2Crypto-0.31.0-x86_64-1.txz:  Upgraded.
l/SDL2-2.0.9-x86_64-2.txz:  Rebuilt.
  Fixed use of SDL_syswm.h with SDL_PROTOTYPES_ONLY in C++ mode.
  Thanks to orbea.
l/libtiff-4.0.10-x86_64-1.txz:  Upgraded.
  This update fixes some denial of service security issues.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7456
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-8905
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10779
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10963
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-18661
  (* Security fix *)
l/netpbm-10.84.02-x86_64-1.txz:  Upgraded.
n/net-snmp-5.8-x86_64-2.txz:  Rebuilt.
  Recompiled to link the perl modules to the new libraries. Thanks to th_r.

1 files changed, 1601 insertions, 0 deletions

diff --git a/source/l/netpbm/netpbm-security-code.patch b/source/l/netpbm/netpbm-security-code.patch
new file mode 100644
index 000000000..6cb6394cb
--- /dev/null
+++ b/source/l/netpbm/netpbm-security-code.patch
@@ -0,0 +1,1601 @@
+diff -urNp a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c
+--- a/analyzer/pgmtexture.c	2018-07-23 15:03:21.372486801 +0200
++++ b/analyzer/pgmtexture.c	2018-07-23 15:05:03.047265799 +0200
+@@ -98,6 +98,8 @@ vector(unsigned int const nl,
+ 
+     assert(nh >= nl);
+ 
++    overflow_add(nh - nl, 1);
++    
+     MALLOCARRAY(v, (unsigned) (nh - nl + 1));
+ 
+     if (v == NULL)
+@@ -129,6 +131,7 @@ matrix (unsigned int const nrl,
+     assert(nrh >= nrl);
+ 
+     /* allocate pointers to rows */
++    overflow_add(nrh - nrl, 1);
+     MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
+     if (m == NULL)
+         pm_error("Unable to allocate memory for a matrix.");
+@@ -137,6 +140,7 @@ matrix (unsigned int const nrl,
+ 
+     assert (nch >= ncl);
+ 
++    overflow_add(nch - ncl, 1);
+     /* allocate rows and set pointers to them */
+     for (i = nrl; i <= nrh; ++i) {
+         MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
+diff -urNp a/converter/other/gemtopnm.c b/converter/other/gemtopnm.c
+--- a/converter/other/gemtopnm.c	2018-07-23 15:03:21.379486786 +0200
++++ b/converter/other/gemtopnm.c	2018-07-23 15:05:03.053265786 +0200
+@@ -106,6 +106,7 @@ main(argc, argv)
+ 
+ 	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
+ 
++    overflow_add(cols, padright);
+     { 
+         /* allocate input row data structure */
+         int plane;
+diff -urNp a/converter/other/jpegtopnm.c b/converter/other/jpegtopnm.c
+--- a/converter/other/jpegtopnm.c	2018-07-23 15:03:21.398486744 +0200
++++ b/converter/other/jpegtopnm.c	2018-07-23 15:05:03.068265754 +0200
+@@ -862,6 +862,8 @@ convertImage(FILE *
+     /* Calculate output image dimensions so we can allocate space */
+     jpeg_calc_output_dimensions(cinfoP);
+ 
++    overflow2(cinfoP->output_width, cinfoP->output_components);
++
+     /* Start decompressor */
+     jpeg_start_decompress(cinfoP);
+ 
+diff -urNp a/converter/other/pbmtopgm.c b/converter/other/pbmtopgm.c
+--- a/converter/other/pbmtopgm.c	2018-07-23 15:03:21.380486783 +0200
++++ b/converter/other/pbmtopgm.c	2018-07-23 15:05:03.068265754 +0200
+@@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
+                  "than the image height (%u rows)", height, rows);
+ 
+     outrow = pgm_allocrow(cols) ;
++    overflow2(width, height);
+     maxval = MIN(PGM_OVERALLMAXVAL, width*height);
+     pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
+ 
+diff -urNp a/converter/other/pnmtoddif.c b/converter/other/pnmtoddif.c
+--- a/converter/other/pnmtoddif.c	2018-07-23 15:03:21.380486783 +0200
++++ b/converter/other/pnmtoddif.c	2018-07-23 15:05:03.068265754 +0200
+@@ -629,6 +629,7 @@ main(int argc, char *argv[]) {
+     switch (PNM_FORMAT_TYPE(format)) {
+     case PBM_TYPE:
+         ip.bits_per_pixel = 1;
++        overflow_add(cols, 7);
+         ip.bytes_per_line = (cols + 7) / 8;
+         ip.spectral = 2;
+         ip.components = 1;
+@@ -644,6 +645,7 @@ main(int argc, char *argv[]) {
+         ip.polarity = 2;
+         break;
+     case PPM_TYPE:
++        overflow2(cols, 3);
+         ip.bytes_per_line = 3 * cols;
+         ip.bits_per_pixel = 24;
+         ip.spectral = 5;
+diff -urNp a/converter/other/pnmtojpeg.c b/converter/other/pnmtojpeg.c
+--- a/converter/other/pnmtojpeg.c	2018-07-23 15:03:21.387486768 +0200
++++ b/converter/other/pnmtojpeg.c	2018-07-23 15:05:03.068265754 +0200
+@@ -606,7 +606,11 @@ read_scan_script(j_compress_ptr const ci
+            want JPOOL_PERMANENT.  
+         */
+         const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
+-        jpeg_scan_info * const scan_info = 
++        const jpeg_scan_info * scan_info;
++      
++        overflow2(nscans, sizeof(jpeg_scan_info));
++      
++        scan_info =
+             (jpeg_scan_info *)
+             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+                                         scan_info_size);
+@@ -938,6 +942,8 @@ compute_rescaling_array(JSAMPLE ** const
+   const long half_maxval = maxval / 2;
+   long val;
+ 
++  overflow_add(maxval, 1);
++  overflow2(maxval+1, sizeof(JSAMPLE));
+   *rescale_p = (JSAMPLE *)
+     (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
+                               (size_t) (((long) maxval + 1L) * 
+@@ -1016,6 +1022,7 @@ convert_scanlines(struct jpeg_compress_s
+     */
+ 
+   /* Allocate the libpnm output and compressor input buffers */
++  overflow2(cinfo_p->image_width, cinfo_p->input_components);
+   buffer = (*cinfo_p->mem->alloc_sarray)
+     ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
+      (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
+diff -urNp a/converter/other/pnmtops.c b/converter/other/pnmtops.c
+--- a/converter/other/pnmtops.c	2018-07-23 15:03:21.399486742 +0200
++++ b/converter/other/pnmtops.c	2018-07-23 15:05:03.068265754 +0200
+@@ -294,17 +294,21 @@ parseCommandLine(int argc, const char **
+     validateCompDimension(width, 72, "-width value");
+     validateCompDimension(height, 72, "-height value");
+     
++    overflow2(width, 72);
+     cmdlineP->width  = width * 72;
++    overflow2(height, 72);
+     cmdlineP->height = height * 72;
+ 
+     if (imagewidthSpec) {
+         validateCompDimension(imagewidth, 72, "-imagewidth value");
++        overflow2(imagewidth, 72);
+         cmdlineP->imagewidth = imagewidth * 72;
+     }
+     else
+         cmdlineP->imagewidth = 0;
+     if (imageheightSpec) {
+-        validateCompDimension(imagewidth, 72, "-imageheight value");
++        validateCompDimension(imageheight, 72, "-imageheight value");
++        overflow2(imageheight, 72);
+         cmdlineP->imageheight = imageheight * 72;
+     }
+     else
+diff -urNp a/converter/other/rletopnm.c b/converter/other/rletopnm.c
+--- a/converter/other/rletopnm.c	2018-07-23 15:03:21.385486773 +0200
++++ b/converter/other/rletopnm.c	2018-07-23 15:05:03.068265754 +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,
+  * and the reason for such modification.
++ *
++ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
+  */
+ /*
+  * rletopnm - A conversion program to convert from Utah's "rle" image format
+diff -urNp a/converter/other/sirtopnm.c b/converter/other/sirtopnm.c
+--- a/converter/other/sirtopnm.c	2018-07-23 15:03:21.398486744 +0200
++++ b/converter/other/sirtopnm.c	2018-07-23 15:05:03.068265754 +0200
+@@ -69,6 +69,7 @@ char* argv[];
+ 	    }
+ 	    break;
+ 	case PPM_TYPE:
++	    overflow3(cols, rows, 3);
+ 	    picsize = cols * rows * 3;
+ 	    planesize = cols * rows;
+             if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
+diff -urNp a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c
+--- a/converter/other/tifftopnm.c	2018-07-23 15:03:21.379486786 +0200
++++ b/converter/other/tifftopnm.c	2018-07-23 15:05:03.068265754 +0200
+@@ -1372,7 +1372,9 @@ convertRasterByRows(pnmOut *       const
+     if (scanbuf == NULL)
+         pm_error("can't allocate memory for scanline buffer");
+ 
+-    MALLOCARRAY(samplebuf, cols * spp);
++    /* samplebuf is unsigned int * !!! */
++    samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp);
++
+     if (samplebuf == NULL)
+         pm_error("can't allocate memory for row buffer");
+ 
+diff -urNp a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c
+--- a/converter/other/xwdtopnm.c	2018-07-23 15:03:21.387486768 +0200
++++ b/converter/other/xwdtopnm.c	2018-07-23 15:05:03.068265754 +0200
+@@ -210,6 +210,10 @@ processX10Header(X10WDFileHeader *  cons
+         *colorsP = pnm_allocrow(2);
+         PNM_ASSIGN1((*colorsP)[0], 0);
+         PNM_ASSIGN1((*colorsP)[1], *maxvalP);
++        overflow_add(h10P->pixmap_width, 15);
++        if(h10P->pixmap_width < 0)
++            pm_error("assert: negative width");
++        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
+         *padrightP =
+             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
+         *bits_per_itemP = 16;
+@@ -635,6 +639,7 @@ processX11Header(X11WDFileHeader *  cons
+ 
+     *colsP = h11FixedP->pixmap_width;
+     *rowsP = h11FixedP->pixmap_height;
++    overflow2(h11FixedP->bytes_per_line, 8);
+     *padrightP =
+         h11FixedP->bytes_per_line * 8 -
+         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
+diff -urNp a/converter/pbm/mdatopbm.c b/converter/pbm/mdatopbm.c
+--- a/converter/pbm/mdatopbm.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/mdatopbm.c	2018-07-23 15:05:03.052265788 +0200
+@@ -245,10 +245,13 @@ main(int argc, char **argv) {
+         pm_readlittleshort(infile, &yy); nInCols = yy;
+     }
+     
++    overflow2(nOutCols, 8);
+     nOutCols = 8 * nInCols;
+     nOutRows = nInRows;
+-    if (bScale) 
++    if (bScale) {
++        overflow2(nOutRows, 2);
+         nOutRows *= 2;
++    }
+ 
+     data = pbm_allocarray(nOutCols, nOutRows);
+     
+diff -urNp a/converter/pbm/mgrtopbm.c b/converter/pbm/mgrtopbm.c
+--- a/converter/pbm/mgrtopbm.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/mgrtopbm.c	2018-07-23 15:05:03.052265788 +0200
+@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
+     if (head.h_high < ' ' || head.l_high < ' ')
+         pm_error("Invalid width field in MGR header");
+     
++    overflow_add(*colsP, pad);
++
+     *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;
+diff -urNp a/converter/pbm/pbmtogem.c b/converter/pbm/pbmtogem.c
+--- a/converter/pbm/pbmtogem.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pbmtogem.c	2018-07-23 15:05:03.052265788 +0200
+@@ -79,6 +79,7 @@ putinit (int const rows, int const cols)
+   bitsperitem = 0;
+   bitshift = 7;
+   outcol = 0;
++  overflow_add(cols, 7);
+   outmax = (cols + 7) / 8;
+   outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
+   lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
+diff -urNp a/converter/pbm/pbmtogo.c b/converter/pbm/pbmtogo.c
+--- a/converter/pbm/pbmtogo.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pbmtogo.c	2018-07-23 15:05:03.052265788 +0200
+@@ -158,6 +158,7 @@ main(int           argc,
+     bitrow = pbm_allocrow(cols);
+ 
+     /* Round cols up to the nearest multiple of 8. */
++    overflow_add(cols, 7);
+     rucols = ( cols + 7 ) / 8;
+     bytesperrow = rucols;       /* GraphOn uses bytes */
+     rucols = rucols * 8;
+diff -urNp a/converter/pbm/pbmtolj.c b/converter/pbm/pbmtolj.c
+--- a/converter/pbm/pbmtolj.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pbmtolj.c	2018-07-23 15:05:03.052265788 +0200
+@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
+ static void
+ allocateBuffers(unsigned int const cols) {
+ 
++    overflow_add(cols, 8);
+     rowBufferSize = (cols + 7) / 8;
++    overflow_add(rowBufferSize, 128);
++    overflow_add(rowBufferSize, rowBufferSize+128);
++    overflow_add(rowBufferSize+10, rowBufferSize/8);
+     packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
+     deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
+ 
+diff -urNp a/converter/pbm/pbmtomda.c b/converter/pbm/pbmtomda.c
+--- a/converter/pbm/pbmtomda.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pbmtomda.c	2018-07-23 15:05:03.052265788 +0200
+@@ -179,6 +179,7 @@ int main(int argc, char **argv)
+     
+     nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
+ 
++    overflow_add(nOutRowsUnrounded, 3);
+     nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
+         /* MDA wants rows a multiple of 4 */   
+     nOutCols = nInCols / 8;
+diff -urNp a/converter/pbm/pbmtoppa/pbm.c b/converter/pbm/pbmtoppa/pbm.c
+--- a/converter/pbm/pbmtoppa/pbm.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pbmtoppa/pbm.c	2018-07-23 15:05:03.051265791 +0200
+@@ -106,6 +106,7 @@ int pbm_readline(pbm_stat* pbm,unsigned
+     return 0;
+ 
+   case P4:
++    overflow_add(pbm->width, 7);
+     tmp=(pbm->width+7)/8;
+     tmp2=fread(data,1,tmp,pbm->fptr);
+     if(tmp2 == tmp)
+@@ -130,6 +131,7 @@ void pbm_unreadline (pbm_stat *pbm, void
+     return;
+ 
+   pbm->unread = 1;
++  overflow_add(pbm->width, 7);
+   pbm->revdata = malloc ((pbm->width+7)/8);
+   memcpy (pbm->revdata, data, (pbm->width+7)/8);
+   pbm->current_line--;
+diff -urNp a/converter/pbm/pbmtoppa/pbmtoppa.c b/converter/pbm/pbmtoppa/pbmtoppa.c
+--- a/converter/pbm/pbmtoppa/pbmtoppa.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pbmtoppa/pbmtoppa.c	2018-07-23 15:05:03.051265791 +0200
+@@ -453,6 +453,7 @@ main(int argc, char *argv[]) {
+             pm_error("main(): unrecognized parameter '%s'", argv[argn]);
+     }
+ 
++    overflow_add(Width, 7);
+     Pwidth=(Width+7)/8;
+     printer.fptr=out;
+ 
+diff -urNp a/converter/pbm/pbmtoxbm.c b/converter/pbm/pbmtoxbm.c
+--- a/converter/pbm/pbmtoxbm.c	2018-07-23 15:03:21.376486792 +0200
++++ b/converter/pbm/pbmtoxbm.c	2018-07-23 15:05:03.053265786 +0200
+@@ -352,6 +352,8 @@ convertRaster(FILE *          const ifP,
+ 
+     unsigned char * bitrow;
+     unsigned int row;
++    
++    overflow_add(cols, padright);
+ 
+     putinit(xbmVersion);
+ 
+diff -urNp a/converter/pbm/pbmto4425.c b/converter/pbm/pbmto4425.c
+--- a/converter/pbm/pbmto4425.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pbmto4425.c	2018-07-23 15:05:03.052265788 +0200
+@@ -2,6 +2,7 @@
+ 
+ #include "nstring.h"
+ #include "pbm.h"
++#include <string.h>
+ 
+ static char bit_table[2][3] = {
+ {1, 4, 0x10},
+@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
+     xres = vmap_width * 2;
+     yres = vmap_height * 3;
+ 
+-    vmap = malloc(vmap_width * vmap_height * sizeof(char));
++    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
+     if(vmap == NULL)
+ 	{
+         pm_error( "Cannot allocate memory" );
+diff -urNp a/converter/pbm/pktopbm.c b/converter/pbm/pktopbm.c
+--- a/converter/pbm/pktopbm.c	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/pktopbm.c	2018-07-23 15:05:03.053265786 +0200
+@@ -280,6 +280,7 @@ main(int argc, char *argv[]) {
+         if (flagbyte == 7) {            /* long form preamble */
+             integer packetlength = get32() ;    /* character packet length */
+             car = get32() ;         /* character number */
++            overflow_add(packetlength, pktopbm_pkloc);
+             endofpacket = packetlength + pktopbm_pkloc;
+                 /* calculate end of packet */
+             if ((car >= MAXPKCHAR) || !filename[car]) {
+diff -urNp a/converter/pbm/thinkjettopbm.l b/converter/pbm/thinkjettopbm.l
+--- a/converter/pbm/thinkjettopbm.l	2018-07-23 15:03:21.377486790 +0200
++++ b/converter/pbm/thinkjettopbm.l	2018-07-23 15:05:03.053265786 +0200
+@@ -114,7 +114,9 @@ DIG             [0-9]
+ <RASTERMODE>\033\*b{DIG}+W  {
+                             int l;
+                             if (rowCount >= rowCapacity) {
+-                                rowCapacity += 100;
++				overflow_add(rowCapacity, 100);
++                                 rowCapacity += 100;
++				overflow2(rowCapacity, sizeof *rows);
+                                 rows = realloc (rows, rowCapacity * sizeof *rows);
+                                 if (rows == NULL)
+                                     pm_error ("Out of memory.");
+@@ -226,6 +228,8 @@ yywrap (void)
+     /*
+      * Quite simple since ThinkJet bit arrangement matches PBM
+      */
++
++    overflow2(maxRowLength, 8);
+     pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
+ 
+     packed_bitrow = malloc(maxRowLength);
+diff -urNp a/converter/pbm/ybmtopbm.c b/converter/pbm/ybmtopbm.c
+--- a/converter/pbm/ybmtopbm.c	2018-07-23 15:03:21.378486788 +0200
++++ b/converter/pbm/ybmtopbm.c	2018-07-23 15:05:03.053265786 +0200
+@@ -43,6 +43,7 @@ getinit(FILE *  const ifP,
+         pm_error("EOF / read error");
+ 
+     *depthP = 1;
++    overflow_add(*colsP, 15);
+ }
+ 
+ 
+diff -urNp a/converter/pgm/lispmtopgm.c b/converter/pgm/lispmtopgm.c
+--- a/converter/pgm/lispmtopgm.c	2018-07-23 15:03:21.400486740 +0200
++++ b/converter/pgm/lispmtopgm.c	2018-07-23 15:05:03.069265751 +0200
+@@ -58,6 +58,7 @@ main( argc, argv )
+         pm_error( "depth (%d bits) is too large", depth);
+ 
+     pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 );
++    overflow_add(cols, 7);
+     grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
+ 
+     for ( row = 0; row < rows; ++row )
+@@ -102,6 +103,8 @@ getinit( file, colsP, rowsP, depthP, pad
+     
+     if ( *depthP == 0 )
+ 	*depthP = 1;	/* very old file */
++
++    overflow_add((int)colsP, 31);
+     
+     *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
+     
+diff -urNp a/converter/pgm/psidtopgm.c b/converter/pgm/psidtopgm.c
+--- a/converter/pgm/psidtopgm.c	2018-07-23 15:03:21.400486740 +0200
++++ b/converter/pgm/psidtopgm.c	2018-07-23 15:05:03.069265751 +0200
+@@ -78,6 +78,7 @@ main(int     argc,
+         pm_error("bits/sample (%d) is too large.", bitspersample);
+ 
+     pgm_writepgminit(stdout, cols, rows, maxval, 0);
++    overflow_add(cols, 7);
+     grayrow = pgm_allocrow((cols + 7) / 8 * 8);
+     for (row = 0; row < rows; ++row) {
+         unsigned int col;
+diff -urNp a/converter/ppm/ilbmtoppm.c b/converter/ppm/ilbmtoppm.c
+--- a/converter/ppm/ilbmtoppm.c	2018-07-23 15:03:21.403486734 +0200
++++ b/converter/ppm/ilbmtoppm.c	2018-07-23 15:08:45.446313490 +0200
+@@ -608,6 +608,7 @@ decode_row(FILE *          const ifP,
+     rawtype *chp;
+ 
+     cols = bmhdP->w;
++    overflow_add(cols, 15);
+     bytes = RowBytes(cols);
+     for( plane = 0; plane < nPlanes; plane++ ) {
+         int mask;
+@@ -695,6 +696,23 @@ decode_mask(FILE *          const ifP,
+  Multipalette handling
+  ****************************************************************************/
+ 
++static void *
++xmalloc2(x, y)
++    int x;
++    int y;
++{
++    void *mem;
++
++    overflow2(x,y);
++    if( x * y == 0 )
++        return NULL;
++
++    mem = malloc2(x,y);
++    if( mem == NULL )
++        pm_error("out of memory allocating %d bytes", x * y);
++    return mem;
++}
++
+ 
+ static void
+ multi_adjust(ColorMap *            const cmapP,
+@@ -1363,6 +1381,9 @@ dcol_to_ppm(FILE *         const ifP,
+     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
+         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
+ 
++    overflow_add(redmaxval, 1);
++    overflow_add(greenmaxval, 1);
++    overflow_add(bluemaxval, 1);
+     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
+     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
+     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
+@@ -1802,7 +1823,9 @@ PCHG_ConvertSmall(PCHGHeader *    const
+             ChangeCount32 = *data++;
+             remDataSize -= 2;
+ 
++            overflow_add(ChangeCount16, ChangeCount32);
+             changes = ChangeCount16 + ChangeCount32;
++            overflow_add(changes, 1);
+             for (i = 0; i < changes; ++i) {
+                 if (totalchanges >= pchgP->TotalChanges) goto fail;
+                 if (remDataSize < 2) goto fail;
+@@ -2067,6 +2090,9 @@ read_pchg(FILE *     const ifP,
+             cmap->mp_change[i] = NULL;
+         if( PCHG.StartLine < 0 ) {
+             int nch;
++            if(PCHG.MaxReg < PCHG.MinReg)
++                pm_error("assert: MinReg > MaxReg");
++            overflow_add(PCHG.MaxReg-PCHG.MinReg, 2);
+             nch = PCHG.MaxReg - PCHG.MinReg +1;
+             MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
+             for( i = 0; i < nch; i++ )
+@@ -2143,6 +2169,7 @@ process_body( FILE *          const ifP,
+     if (typeid == ID_ILBM) {
+         int isdeep;
+ 
++        overflow_add(bmhdP->w, 15);
+         MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
+         *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
+ 
+diff -urNp a/converter/ppm/ilbmtoppm.c.rej b/converter/ppm/ilbmtoppm.c.rej
+--- a/converter/ppm/ilbmtoppm.c.rej	1970-01-01 01:00:00.000000000 +0100
++++ b/converter/ppm/ilbmtoppm.c.rej	2018-07-23 15:05:03.071265747 +0200
+@@ -0,0 +1,46 @@
++--- converter/ppm/ilbmtoppm.c
+++++ converter/ppm/ilbmtoppm.c
++@@ -694,6 +695,23 @@ decode_mask(FILE *          const ifP,
++  Multipalette handling
++  ****************************************************************************/
++ 
+++static void *
+++xmalloc2(x, y)
+++    int x;
+++    int y;
+++{
+++    void *mem;
+++
+++    overflow2(x,y);
+++    if( x * y == 0 )
+++        return NULL;
+++
+++    mem = malloc2(x,y);
+++    if( mem == NULL )
+++        pm_error("out of memory allocating %d bytes", x * y);
+++    return mem;
+++}
+++
++ 
++ static void
++ multi_adjust(cmap, row, palchange)
++@@ -1356,6 +1374,9 @@ dcol_to_ppm(FILE *         const ifP,
++     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
++         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
++     
+++    overflow_add(redmaxval, 1);
+++    overflow_add(greenmaxval, 1);
+++    overflow_add(bluemaxval, 1);
++     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
++     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
++     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
++@@ -1785,7 +1806,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, datasize)
++             ChangeCount32 = *data++;
++             datasize -= 2;
++ 
+++            overflow_add(ChangeCount16, ChangeCount32);
++             changes = ChangeCount16 + ChangeCount32;
+++            overflow_add(changes, 1);
++             for( i = 0; i < changes; i++ ) {
++                 if( totalchanges >= PCHG->TotalChanges ) goto fail;
++                 if( datasize < 2 ) goto fail;
+diff -urNp a/converter/ppm/imgtoppm.c b/converter/ppm/imgtoppm.c
+--- a/converter/ppm/imgtoppm.c	2018-07-23 15:03:21.404486731 +0200
++++ b/converter/ppm/imgtoppm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
+             len = atoi((char*) buf );
+             if ( fread( buf, len, 1, ifp ) != 1 )
+                 pm_error( "bad colormap buf" );
++            overflow2(cmaplen, 3);
+             if ( cmaplen * 3 != len )
+             {
+                 pm_message(
+@@ -105,6 +106,7 @@ main(int argc, char ** argv) {
+                 pm_error( "bad pixel data header" );
+             buf[8] = '\0';
+             len = atoi((char*) buf );
++            overflow2(cols, rows);
+             if ( len != cols * rows )
+                 pm_message(
+                     "pixel data length (%d) does not match image size (%d)",
+diff -urNp a/converter/ppm/Makefile b/converter/ppm/Makefile
+--- a/converter/ppm/Makefile	2018-07-23 15:03:21.406486727 +0200
++++ b/converter/ppm/Makefile	2018-07-23 15:05:03.071265747 +0200
+@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm
+ 
+ PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
+ 		leaftoppm mtvtoppm neotoppm \
+-		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
++		pcxtoppm pc1toppm pi1toppm pjtoppm \
+ 		ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \
+ 		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
+ 		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
+diff -urNp a/converter/ppm/pcxtoppm.c b/converter/ppm/pcxtoppm.c
+--- a/converter/ppm/pcxtoppm.c	2018-07-23 15:03:21.406486727 +0200
++++ b/converter/ppm/pcxtoppm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes,
+     /*
+      * clear the pixel buffer
+      */
++    overflow2(bytesperline, 8);
+     npixels = (bytesperline * 8) / bitsperpixel;
+     p    = pixels;
+     while (--npixels >= 0)
+@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE *       const ifP,
+     }
+ 
+     /*  BytesPerLine should be >= BitsPerPixel * cols / 8  */
++    overflow2(BytesPerLine, 8);
+     rawcols = BytesPerLine * 8 / BitsPerPixel;
+     if (headerCols > rawcols) {
+         pm_message("warning - BytesPerLine = %d, "
+diff -urNp a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c
+--- a/converter/ppm/picttoppm.c	2018-07-23 15:03:21.404486731 +0200
++++ b/converter/ppm/picttoppm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -1,3 +1,4 @@
++#error "Unfixable. Don't ship me"
+ /*
+  * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
+  *
+diff -urNp a/converter/ppm/pjtoppm.c b/converter/ppm/pjtoppm.c
+--- a/converter/ppm/pjtoppm.c	2018-07-23 15:03:21.402486736 +0200
++++ b/converter/ppm/pjtoppm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -127,20 +127,22 @@ main(argc, argv)
+                 case 'V':   /* send plane */
+                 case 'W':   /* send last plane */
+                     if (rows == -1 || r >= rows || image == NULL) {
+-                        if (rows == -1 || r >= rows)
++                        if (rows == -1 || r >= rows) {
++                            overflow_add(rows, 100);
+                             rows += 100;
++                        }
++
+                         if (image == NULL) {
+-                            MALLOCARRAY(image, rows * planes);
+-                            MALLOCARRAY(imlen, rows * planes);
++                            image = (unsigned char **)
++                                malloc3(rows , planes , sizeof(unsigned char *));
++                            imlen = (int *) malloc3(rows , planes,  sizeof(int));
+                         }
+                         else {
+-                            image = (unsigned char **) 
+-                                realloc(image, 
+-                                        rows * planes * 
+-                                        sizeof(unsigned char *));
+-                            imlen = (int *) 
+-                                realloc(imlen, rows * planes * sizeof(int));
+-                        }
++                            overflow2(rows,planes);
++                            image = (unsigned char **)
++                                realloc2(image, rows * planes,
++                                    sizeof(unsigned char *));
++                            imlen = (int *) realloc2(imlen, rows * planes, sizeof(int));                        }
+                     }
+                     if (image == NULL || imlen == NULL)
+                         pm_error("out of memory");
+@@ -212,8 +214,10 @@ main(argc, argv)
+                 for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2)
+                     for (cmd = image[p + r * planes][c],
+                              val = image[p + r * planes][c+1]; 
+-                         cmd >= 0 && i < newcols; cmd--, i++) 
++                         cmd >= 0 && i < newcols; cmd--, i++) {
+                         buf[i] = val;
++                        overflow_add(i, 1);
++                    }
+                 cols = cols > i ? cols : i;
+                 free(image[p + r * planes]);
+                 /* 
+@@ -224,6 +228,7 @@ main(argc, argv)
+                 image[p + r * planes] = (unsigned char *) realloc(buf, i);
+             }
+         }
++        overflow2(cols, 8);
+         cols *= 8;
+     }
+             
+diff -urNp a/converter/ppm/ppmtoeyuv.c b/converter/ppm/ppmtoeyuv.c
+--- a/converter/ppm/ppmtoeyuv.c	2018-07-23 15:03:21.404486731 +0200
++++ b/converter/ppm/ppmtoeyuv.c	2018-07-23 15:05:03.071265747 +0200
+@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
+ 
+     int index;
+ 
++    overflow_add(maxval, 1);
+     MALLOCARRAY_NOFAIL(mult299   , maxval+1);
+     MALLOCARRAY_NOFAIL(mult587   , maxval+1);
+     MALLOCARRAY_NOFAIL(mult114   , maxval+1);
+diff -urNp a/converter/ppm/ppmtolj.c b/converter/ppm/ppmtolj.c
+--- a/converter/ppm/ppmtolj.c	2018-07-23 15:03:21.401486738 +0200
++++ b/converter/ppm/ppmtolj.c	2018-07-23 15:05:03.071265747 +0200
+@@ -182,6 +182,7 @@ int main(int argc, char *argv[]) {
+     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)
+diff -urNp a/converter/ppm/ppmtomitsu.c b/converter/ppm/ppmtomitsu.c
+--- a/converter/ppm/ppmtomitsu.c	2018-07-23 15:03:21.403486734 +0200
++++ b/converter/ppm/ppmtomitsu.c	2018-07-23 15:05:03.071265747 +0200
+@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
+         medias = MSize_User;
+ 
+     if (dpi300) {
++        overflow2(medias.maxcols, 2);
++        overflow2(medias.maxrows, 2);
+         medias.maxcols *= 2;
+         medias.maxrows *= 2;
+     }
+diff -urNp a/converter/ppm/ppmtopcx.c b/converter/ppm/ppmtopcx.c
+--- a/converter/ppm/ppmtopcx.c	2018-07-23 15:03:21.403486734 +0200
++++ b/converter/ppm/ppmtopcx.c	2018-07-23 15:05:03.071265747 +0200
+@@ -425,6 +425,8 @@ ppmTo16ColorPcx(pixel **            cons
+             else                   Planes = 1;
+         }
+     }
++    overflow2(BitsPerPixel, cols);
++    overflow_add(BitsPerPixel * cols, 7);
+     BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
+     MALLOCARRAY_NOFAIL(indexRow, cols);
+     MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
+diff -urNp a/converter/ppm/ppmtopict.c b/converter/ppm/ppmtopict.c
+--- a/converter/ppm/ppmtopict.c	2018-07-23 15:03:21.402486736 +0200
++++ b/converter/ppm/ppmtopict.c	2018-07-23 15:05:03.071265747 +0200
+@@ -450,6 +450,8 @@ main(int argc, const char ** argv) {
+     putShort(stdout, 0);            /* mode */
+ 
+     /* Finally, write out the data. */
++    overflow_add(cols/MAX_COUNT, 1);
++    overflow_add(cols, cols/MAX_COUNT+1);
+     outBuf = malloc((unsigned)(cols+cols/MAX_COUNT+1));
+     for (row = 0, oc = 0; row < rows; ++row) {
+         unsigned int rowSize;
+diff -urNp a/converter/ppm/ppmtopj.c b/converter/ppm/ppmtopj.c
+--- a/converter/ppm/ppmtopj.c	2018-07-23 15:03:21.405486729 +0200
++++ b/converter/ppm/ppmtopj.c	2018-07-23 15:05:03.071265747 +0200
+@@ -179,6 +179,7 @@ char *argv[];
+ 	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
+ 
+ 	pm_close( ifp );
++        overflow2(cols,2);
+ 	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
+ 	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
+ 
+diff -urNp a/converter/ppm/ppmtopjxl.c b/converter/ppm/ppmtopjxl.c
+--- a/converter/ppm/ppmtopjxl.c	2018-07-23 15:03:21.405486729 +0200
++++ b/converter/ppm/ppmtopjxl.c	2018-07-23 15:05:03.071265747 +0200
+@@ -267,6 +267,9 @@ main(int argc, const char * argv[]) {
+     if (maxval > PCL_MAXVAL)
+         pm_error("color range too large; reduce with ppmcscale");
+ 
++    if (cols < 0 || rows < 0)
++        pm_error("negative size is not possible");
++
+     /* Figure out the colormap. */
+     pm_message("Computing colormap...");
+     chv = ppm_computecolorhist(pixels, cols, rows, MAXCOLORS, &colors);
+@@ -286,6 +289,8 @@ main(int argc, const char * argv[]) {
+         case 0: /* direct mode (no palette) */
+             bpp = bitsperpixel(maxval); /* bits per pixel */
+             bpg = bpp; bpb = bpp;
++            overflow2(bpp, 3);
++            overflow_add(bpp*3, 7);
+             bpp = (bpp*3+7)>>3;     /* bytes per pixel now */
+             bpr = (bpp<<3)-bpg-bpb; 
+             bpp *= cols;            /* bytes per row now */
+@@ -295,9 +300,13 @@ main(int argc, const char * argv[]) {
+         case 3: case 7: pclindex++;
+         default:
+             bpp = 8/pclindex;
++            overflow_add(cols, bpp);
++            if(bpp == 0)
++                pm_error("assert: no bpp");
+             bpp = (cols+bpp-1)/bpp;      /* bytes per row */
+         }
+     }
++    overflow2(bpp,2);
+     inrow = (char *)malloc((unsigned)bpp);
+     outrow = (char *)malloc((unsigned)bpp*2);
+     runcnt = (signed char *)malloc((unsigned)bpp);
+diff -urNp a/converter/ppm/ppmtowinicon.c b/converter/ppm/ppmtowinicon.c
+--- a/converter/ppm/ppmtowinicon.c	2018-07-23 15:03:21.405486729 +0200
++++ b/converter/ppm/ppmtowinicon.c	2018-07-23 15:05:03.071265747 +0200
+@@ -12,6 +12,7 @@
+ 
+ #include <math.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "pm_c_util.h"
+ #include "winico.h"
+@@ -214,6 +215,7 @@ createAndBitmap (gray ** const ba, int c
+    MALLOCARRAY_NOFAIL(rowData, rows);
+    icBitmap->xBytes = xBytes;
+    icBitmap->data   = rowData;
++   overflow2(xBytes, rows);
+    icBitmap->size   = xBytes * rows;
+    for (y=0;y<rows;y++) {
+       u1 * row;
+@@ -342,6 +344,7 @@ create4Bitmap (pixel ** const pa, int co
+    MALLOCARRAY_NOFAIL(rowData, rows);
+    icBitmap->xBytes = xBytes;
+    icBitmap->data   = rowData;
++   overflow2(xBytes, rows);
+    icBitmap->size   = xBytes * rows;
+ 
+    for (y=0;y<rows;y++) {
+@@ -402,6 +405,7 @@ create8Bitmap (pixel ** const pa, int co
+    MALLOCARRAY_NOFAIL(rowData, rows);
+    icBitmap->xBytes = xBytes;
+    icBitmap->data   = rowData;
++   overflow2(xBytes, rows);
+    icBitmap->size   = xBytes * rows;
+ 
+    for (y=0;y<rows;y++) {
+@@ -709,7 +713,11 @@ addEntryToIcon(MS_Ico       const MSIcon
+     entry->bitcount      = bpp;
+     entry->ih            = createInfoHeader(entry, xorBitmap, andBitmap);
+     entry->colors        = palette->colors;
+-    entry->size_in_bytes = 
++    overflow2(4, entry->color_count);
++    overflow_add(xorBitmap->size, andBitmap->size);
++    overflow_add(xorBitmap->size + andBitmap->size, 40);
++    overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count);
++    entry->size_in_bytes =
+         xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
+     if (verbose) 
+         pm_message("entry->size_in_bytes = %d + %d + %d = %d",
+diff -urNp a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c
+--- a/converter/ppm/ppmtoxpm.c	2018-07-23 15:03:21.405486729 +0200
++++ b/converter/ppm/ppmtoxpm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -198,6 +198,7 @@ genNumstr(unsigned int const input, int
+     unsigned int i;
+ 
+     /* Allocate memory for printed number.  Abort if error. */
++    overflow_add(digits, 1);
+     if (!(str = (char *) malloc(digits + 1)))
+         pm_error("out of memory");
+ 
+@@ -315,6 +316,7 @@ genCmap(colorhist_vector const chv,
+     unsigned int charsPerPixel;
+     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.",
+diff -urNp a/converter/ppm/qrttoppm.c b/converter/ppm/qrttoppm.c
+--- a/converter/ppm/qrttoppm.c	2018-07-23 15:03:21.406486727 +0200
++++ b/converter/ppm/qrttoppm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -46,7 +46,7 @@ main( argc, argv )
+ 
+     ppm_writeppminit( stdout, cols, rows, maxval, 0 );
+     pixelrow = ppm_allocrow( cols );
+-    buf = (unsigned char *) malloc( 3 * cols );
++    buf = (unsigned char *) malloc2( 3 , cols );
+     if ( buf == (unsigned char *) 0 )
+ 	pm_error( "out of memory" );
+ 
+diff -urNp a/converter/ppm/sldtoppm.c b/converter/ppm/sldtoppm.c
+--- a/converter/ppm/sldtoppm.c	2018-07-23 15:03:21.401486738 +0200
++++ b/converter/ppm/sldtoppm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -154,127 +154,85 @@ vscale(int * const px,
+ 
+ 
+ 
+-static void
+-upcase(const char * const sname,
+-       char *       const uname) {
+-
+-    unsigned int i;
+-    const char * ip;
+-
+-    for (i = 0, ip = sname; i < 31; ++i) {
+-        char const ch = *ip++;
+-
+-        if (ch != EOS)
+-            uname[i] = islower(ch) ? toupper(ch) : ch;
+-    }
+-    uname[i] = EOS;
+-}
+-
+-
+-
+-static void
+-skipBytes(FILE *       const fileP,
+-          unsigned int const count) {
+-
+-    unsigned int i;
+-
+-    for (i = 0; i < count; ++i)
+-        getc(fileP);
+-}
+-
+-
+-
+-static void
+-scanDirectory(FILE *       const slFileP,
+-              long         const dirPos,
+-              bool         const dirOnly,
+-              const char * const uname,
+-              bool *       const foundP) {
+-/*----------------------------------------------------------------------------
+-   Scan the directory at the current position in *slFileP, either listing
+-   the directory ('dirOnly' true) or searching for a slide named
+-   'uname' ('dirOnly' false).
+-
+-   'dirPos' is the offset in the file of the directory, i.e. the current
+-   position of *slFileP.
+-
+-   In the latter case, return as *foundP whether the slide name is there.
+------------------------------------------------------------------------------*/
+-    bool found;
+-    bool eof;
+-    long pos;
+-    unsigned char libent[36];
+-
+-    for (found = false, eof = false, pos = dirPos; !found && !eof; ) {
+-        size_t readCt;
+-        readCt = fread(libent, 36, 1, slFileP);
+-        if (readCt != 1)
+-            eof = true;
+-        else {
+-            /* The directory entry is 32 bytes of NUL-terminated slide name
+-               followed by 4 bytes of offset of the next directory entry.
+-            */
+-            const char * const slideName = (const char *)(&libent[0]);
+-            if (pm_strnlen(slideName, 32) == 32)
+-                pm_error("Invalid input: slide name field is not "
+-                         "nul-terminated");
+-            else {
+-                if (strlen(slideName) == 0)
+-                    eof = true;
+-                else {
+-                    pos += 36;
+-                    if (dirOnly) {
+-                        pm_message("  %s", slideName);
+-                    } else if (streq(slideName, uname)) {
+-                        long const dpos =
+-                            (((((libent[35] << 8) | libent[34]) << 8) |
+-                              libent[33]) << 8) | libent[32];
+-
+-                        if ((slFileP == stdin) ||
+-                            (fseek(slFileP, dpos, 0) == -1)) {
+-
+-                            skipBytes(slFileP, dpos - pos);
+-                        }
+-                        found = true;
+-                    }
+-                }
+-            }
+-        }
+-    }
+-    *foundP = found;
+-}
+-
+ /*  SLIDEFIND  --  Find  a  slide  in  a  library  or,  if  DIRONLY is
+            nonzero, print a directory listing of the  library.
+            If  UCASEN  is nonzero, the requested slide name is
+            converted to upper case. */
+ 
+ static void
+-slidefind(const char * const slideName,
+-          bool         const dirOnly,
++slidefind(const char * const sname,
++          bool         const dironly,
+           bool         const ucasen) {
+ 
+-    char uname[32];  /* upper case translation of 'slideName' */
+-    char header[32]; /* (supposed) header read from file */
++    char uname[32];
++    unsigned char libent[36];
++    long pos;
+     bool found;
++    bool eof;
+ 
+-    if (dirOnly)
++    if (dironly)
+         pm_message("Slides in library:");
+     else {
+-        upcase(slideName, uname);
++        unsigned int i;
++        const char * ip;
++        
++        ip = sname; /* initial value */
++        
++        for (i = 0; i < 31; ++i) {
++            char const ch = *ip++;
++            if (ch == EOS)
++                break;
++
++            {
++                char const upperCh =
++                    ucasen && islower(ch) ? toupper(ch) : ch;
++                
++                uname[i] = upperCh;
++            }
++        }
++        uname[i] = EOS;
+     }
+ 
+     /* Read slide library header and verify. */
+-
+-    if ((fread(header, 32, 1, slfile) != 1) ||
+-        (!STRSEQ(header, "AutoCAD Slide Library 1.0\r\n\32"))) {
++    
++    if ((fread(libent, 32, 1, slfile) != 1) ||
++        (!streq((char *)libent, "AutoCAD Slide Library 1.0\015\012\32"))) {
+         pm_error("not an AutoCAD slide library file.");
+     }
++    pos = 32;
++    
++    /* Search for a slide with the requested name or list the directory */
++    
++    for (found = false, eof = false; !found && !eof; ) {
++        size_t readCt;
++        readCt = fread(libent, 36, 1, slfile);
++        if (readCt != 1)
++            eof = true;
++        else if (strlen((char *)libent) == 0)
++            eof = true;
++    }
++    if (!eof) {
++        pos += 36;
++        if (dironly) {
++            pm_message("  %s", libent);
++        } else if (streq((char *)libent, uname)) {
++            long dpos;
++
++            dpos = (((((libent[35] << 8) | libent[34]) << 8) |
++                     libent[33]) << 8) | libent[32];
++
++            if ((slfile == stdin) || (fseek(slfile, dpos, 0) == -1)) {
++                dpos -= pos;
++        
++                while (dpos-- > 0)
++                    getc(slfile);
++            }
++            found = true;
++        }
++    }
+ 
+-    scanDirectory(slfile, 32, dirOnly, ucasen ? uname : slideName, &found);
+-
+-    if (!found && !dirOnly)
+-        pm_error("slide '%s' not in library.", slideName);
++    if (!found && !dironly)
++        pm_error("slide '%s' not in library.", sname);
+ }
+ 
+ 
+@@ -392,7 +350,7 @@ slider(slvecfn   slvec,
+ 
+     /* Verify that slide format is compatible with this program. */
+ 
+-    if (!STRSEQ(slfrof.slh, slhi.slh))
++    if (streq(slfrof.slh, slhi.slh))
+         pm_error("this is not an AutoCAD slide file.");
+ 
+     /* Verify that the number format and file level in the header  are
+@@ -506,6 +464,8 @@ slider(slvecfn   slvec,
+ 
+     /* Allocate image buffer and clear it to black. */
+ 
++    overflow_add(ixdots, 1);
++    overflow_add(iydots, 1);
+     pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
+     PPM_ASSIGN(rgbcolor, 0, 0, 0);
+     ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
+diff -urNp a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c
+--- a/converter/ppm/ximtoppm.c	2018-07-23 15:03:21.402486736 +0200
++++ b/converter/ppm/ximtoppm.c	2018-07-23 15:05:03.071265747 +0200
+@@ -118,6 +118,7 @@ ReadXimHeader(FILE *     const in_fp,
+     header->bits_channel = atoi(a_head.bits_per_channel);
+     header->alpha_flag = atoi(a_head.alpha_channel);
+     if (strlen(a_head.author)) {
++        overflow_add(strlen(a_head.author),1);
+         if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
+                 1))) {
+             pm_message("ReadXimHeader: can't calloc author string" );
+@@ -127,6 +128,7 @@ ReadXimHeader(FILE *     const in_fp,
+         strncpy(header->author, a_head.author, strlen(a_head.author));
+     }
+     if (strlen(a_head.date)) {
++        overflow_add(strlen(a_head.date),1);
+         if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
+             pm_message("ReadXimHeader: can't calloc date string" );
+             return(0);
+@@ -135,6 +137,7 @@ ReadXimHeader(FILE *     const in_fp,
+         strncpy(header->date, a_head.date, strlen(a_head.date));
+     }
+     if (strlen(a_head.program)) {
++        overflow_add(strlen(a_head.program),1);
+         if (!(header->program = calloc(
+                     (unsigned int)strlen(a_head.program) + 1, 1))) {
+             pm_message("ReadXimHeader: can't calloc program string" );
+@@ -161,6 +164,7 @@ ReadXimHeader(FILE *     const in_fp,
+     if (header->nchannels == 3 && header->bits_channel == 8)
+         header->ncolors = 0;
+     else if (header->nchannels == 1 && header->bits_channel == 8) {
++        overflow2(header->ncolors, sizeof(Color));
+         header->colors = (Color *)calloc((unsigned int)header->ncolors,
+                 sizeof(Color));
+         if (header->colors == NULL) {
+diff -urNp a/editor/pamcut.c b/editor/pamcut.c
+--- a/editor/pamcut.c	2018-07-23 15:03:21.362486822 +0200
++++ b/editor/pamcut.c	2018-07-23 15:05:03.046265802 +0200
+@@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
+ 
+     outpam = inpam;    /* Initial value -- most fields should be same */
+     outpam.file   = ofP;
++    overflow_add(rightcol, 1);
++    overflow_add(bottomrow, 1);
+     outpam.width  = rightcol - leftcol + 1;
+     outpam.height = bottomrow - toprow + 1;
+ 
+diff -urNp a/editor/pnmgamma.c b/editor/pnmgamma.c
+--- a/editor/pnmgamma.c	2018-07-23 15:03:21.364486818 +0200
++++ b/editor/pnmgamma.c	2018-07-23 15:05:03.046265802 +0200
+@@ -596,6 +596,7 @@ createGammaTables(enum transferFunction
+                   xelval **             const btableP) {
+ 
+     /* Allocate space for the tables. */
++    overflow_add(maxval, 1);
+     MALLOCARRAY(*rtableP, maxval+1);
+     MALLOCARRAY(*gtableP, maxval+1);
+     MALLOCARRAY(*btableP, maxval+1);
+diff -urNp a/editor/pnmhisteq.c b/editor/pnmhisteq.c
+--- a/editor/pnmhisteq.c	2018-07-23 15:03:21.362486822 +0200
++++ b/editor/pnmhisteq.c	2018-07-23 15:05:03.046265802 +0200
+@@ -107,6 +107,7 @@ computeLuminosityHistogram(xel * const *
+     unsigned int pixelCount;
+     unsigned int * lumahist;
+ 
++    overflow_add(maxval, 1);
+     MALLOCARRAY(lumahist, maxval + 1);
+     if (lumahist == NULL)
+         pm_error("Out of storage allocating array for %u histogram elements",
+diff -urNp a/editor/pnmindex.csh b/editor/pnmindex.csh
+--- a/editor/pnmindex.csh	2018-07-23 15:03:21.369486807 +0200
++++ b/editor/pnmindex.csh	2018-07-23 15:05:03.046265802 +0200
+@@ -1,5 +1,7 @@
+ #!/bin/csh -f
+ #
++echo "Unsafe code, needs debugging, do not ship"
++exit 1
+ # pnmindex - build a visual index of a bunch of anymaps
+ #
+ # Copyright (C) 1991 by Jef Poskanzer.
+diff -urNp a/editor/pnmpad.c b/editor/pnmpad.c
+--- a/editor/pnmpad.c	2018-07-23 15:03:21.362486822 +0200
++++ b/editor/pnmpad.c	2018-07-23 15:05:03.046265802 +0200
+@@ -634,6 +634,8 @@ main(int argc, const char ** argv) {
+ 
+     computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
+ 
++    overflow_add(cols, lpad);
++    overflow_add(cols + lpad, rpad);
+     newcols = cols + lpad + rpad;
+ 
+     if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
+diff -urNp a/editor/pnmremap.c b/editor/pnmremap.c
+--- a/editor/pnmremap.c	2018-07-23 15:03:21.363486820 +0200
++++ b/editor/pnmremap.c	2018-07-23 15:09:26.462101272 +0200
+@@ -468,6 +468,7 @@ fserr_init(struct pam *   const pamP,
+ 
+     unsigned int const fserrSize = pamP->width + 2;
+ 
++    overflow_add(pamP->width, 2);
+     fserrP->width = pamP->width;
+ 
+     MALLOCARRAY(fserrP->thiserr, pamP->depth);
+@@ -506,6 +507,7 @@ floydInitRow(struct pam *   const pamP,
+ 
+     unsigned int col;
+ 
++    overflow_add(pamP->width, 2);
+     for (col = 0; col < pamP->width + 2; ++col) {
+         unsigned int plane;
+         for (plane = 0; plane < pamP->depth; ++plane)
+diff -urNp a/editor/pnmremap.c.rej b/editor/pnmremap.c.rej
+--- a/editor/pnmremap.c.rej	1970-01-01 01:00:00.000000000 +0100
++++ b/editor/pnmremap.c.rej	2018-07-23 15:05:03.046265802 +0200
+@@ -0,0 +1,10 @@
++--- editor/pnmremap.c
+++++ editor/pnmremap.c
++@@ -506,6 +507,7 @@ floydInitRow(struct pam * const pamP, struct Fserr * const fserrP) {
++ 
++     int col;
++ 
+++    overflow_add(pamP->width, 2);
++     for (col = 0; col < pamP->width + 2; ++col) {
++         unsigned int plane;
++         for (plane = 0; plane < pamP->depth; ++plane)
+diff -urNp a/editor/pnmscalefixed.c b/editor/pnmscalefixed.c
+--- a/editor/pnmscalefixed.c	2018-07-23 15:03:21.365486816 +0200
++++ b/editor/pnmscalefixed.c	2018-07-23 15:05:03.046265802 +0200
+@@ -214,6 +214,7 @@ compute_output_dimensions(const struct c
+                           const int rows, const int cols,
+                           int * newrowsP, int * newcolsP) {
+ 
++    overflow2(rows, cols);
+     if (cmdline.pixels) {
+         if (rows * cols <= cmdline.pixels) {
+             *newrowsP = rows;
+@@ -265,6 +266,8 @@ compute_output_dimensions(const struct c
+ 
+     if (*newcolsP < 1) *newcolsP = 1;
+     if (*newrowsP < 1) *newrowsP = 1;
++
++    overflow2(*newcolsP, *newrowsP);
+ }        
+ 
+ 
+@@ -446,6 +449,9 @@ main(int argc, char **argv ) {
+        unfilled.  We can address that by stretching, whereas the other
+        case would require throwing away some of the input.
+     */
++
++    overflow2(newcols, SCALE);
++    overflow2(newrows, SCALE);
+     sxscale = SCALE * newcols / cols;
+     syscale = SCALE * newrows / rows;
+ 
+diff -urNp a/editor/ppmdither.c b/editor/ppmdither.c
+--- a/editor/ppmdither.c	2018-07-23 15:03:21.363486820 +0200
++++ b/editor/ppmdither.c	2018-07-23 15:05:03.046265802 +0200
+@@ -356,6 +356,11 @@ dithMatrix(unsigned int const dithPower)
+             (dithDim * sizeof(*dithMat)) + /* pointers */
+             (dithDim * dithDim * sizeof(**dithMat)); /* data */
+         
++
++        overflow2(dithDim, sizeof(*dithMat));
++        overflow3(dithDim, dithDim, sizeof(**dithMat));
++        overflow_add(dithDim * sizeof(*dithMat), dithDim * dithDim * sizeof(**dithMat));
++
+         dithMat = malloc(dithMatSize);
+         
+         if (dithMat == NULL) 
+diff -urNp a/editor/specialty/pamoil.c b/editor/specialty/pamoil.c
+--- a/editor/specialty/pamoil.c	2018-07-23 15:03:21.366486814 +0200
++++ b/editor/specialty/pamoil.c	2018-07-23 15:05:03.045265804 +0200
+@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
+     tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
+     pm_close(ifp);
+ 
++    overflow_add(inpam.maxval, 1);
+     MALLOCARRAY(hist, inpam.maxval + 1);
+     if (hist == NULL)
+         pm_error("Unable to allocate memory for histogram.");
+diff -urNp a/lib/libpam.c b/lib/libpam.c
+--- a/lib/libpam.c	2018-07-23 15:03:21.373486799 +0200
++++ b/lib/libpam.c	2018-07-23 15:05:03.050265793 +0200
+@@ -225,7 +225,8 @@ allocPamRow(const struct pam * const pam
+     unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
+     tuple * tuplerow;
+ 
+-    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
++    overflow_add(sizeof(tuple *), bytesPerTuple);
++    tuplerow = malloc2(pamP->width, (sizeof(tuple *) + bytesPerTuple));
+ 
+     if (tuplerow != NULL) {
+         /* Now we initialize the pointers to the individual tuples
+diff -urNp a/lib/libpammap.c b/lib/libpammap.c
+--- a/lib/libpammap.c	2018-07-23 15:03:21.373486799 +0200
++++ b/lib/libpammap.c	2018-07-23 15:05:03.050265793 +0200
+@@ -108,7 +108,9 @@ allocTupleIntListItem(struct pam * const
+     */
+     struct tupleint_list_item * retval;
+ 
+-    unsigned int const size = 
++    overflow2(pamP->depth, sizeof(sample));
++    overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample));
++    unsigned int const size =
+         sizeof(*retval) - sizeof(retval->tupleint.tuple) 
+         + pamP->depth * sizeof(sample);
+ 
+diff -urNp a/lib/libpm.c b/lib/libpm.c
+--- a/lib/libpm.c	2018-07-23 15:03:21.372486801 +0200
++++ b/lib/libpm.c	2018-07-23 15:05:03.050265793 +0200
+@@ -888,5 +888,53 @@ pm_parse_height(const char * const arg)
+     return height;
+ }
+ 
++/*
++ *	Maths wrapping
++ */
+ 
++void __overflow2(int a, int b)
++{
++        if(a < 0 || b < 0)
++                pm_error("object too large");
++        if(b == 0)
++                return;
++        if(a > INT_MAX / b)
++                pm_error("object too large");
++}
++
++void overflow3(int a, int b, int c)
++{
++        overflow2(a,b);
++        overflow2(a*b, c);
++}
++
++void overflow_add(int a, int b)
++{
++        if( a > INT_MAX - b)
++                pm_error("object too large");
++}
++
++void *malloc2(int a, int b)
++{
++        overflow2(a, b);
++        if(a*b == 0)
++                pm_error("Zero byte allocation");
++        return malloc(a*b);
++}
++
++void *malloc3(int a, int b, int c)
++{
++        overflow3(a, b, c);
++        if(a*b*c == 0)
++                pm_error("Zero byte allocation");
++        return malloc(a*b*c);
++}
++
++void *realloc2(void * a, int b, int c)
++{
++        overflow2(b, c);
++        if(b*c == 0)
++                pm_error("Zero byte allocation");
++        return realloc(a, b*c);
++}
+ 
+diff -urNp a/lib/pm.h b/lib/pm.h
+--- a/lib/pm.h	2018-07-23 15:03:21.376486792 +0200
++++ b/lib/pm.h	2018-07-23 15:05:03.050265793 +0200
+@@ -435,5 +435,12 @@ pm_parse_height(const char * const arg);
+ }
+ #endif
+ 
++void *malloc2(int, int);
++void *malloc3(int, int, int);
++#define overflow2(a,b) __overflow2(a,b)
++void __overflow2(int, int);
++void overflow3(int, int, int);
++void overflow_add(int, int);
++
+ 
+ #endif
+diff -urNp a/other/pnmcolormap.c b/other/pnmcolormap.c
+--- a/other/pnmcolormap.c	2018-07-23 15:03:21.362486822 +0200
++++ b/other/pnmcolormap.c	2018-07-23 15:05:03.041265812 +0200
+@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
+             pamP->width = intsqrt;
+         else 
+             pamP->width = intsqrt + 1;
++            overflow_add(intsqrt, 1);
+     }
+     {
+         unsigned int const intQuotient = colormap.size / pamP->width;
+diff -urNp a/urt/rle_addhist.c b/urt/rle_addhist.c
+--- a/urt/rle_addhist.c	2018-07-23 15:03:21.419486699 +0200
++++ b/urt/rle_addhist.c	2018-07-23 15:05:03.072265745 +0200
+@@ -70,13 +70,18 @@ rle_addhist(char *          argv[],
+         return;
+     
+     length = 0;
+-    for (i = 0; argv[i]; ++i)
++    for (i = 0; argv[i]; ++i) {
++        overflow_add(length, strlen(argv[i]));
++        overflow_add(length+1, strlen(argv[i]));
+         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
++    }
+ 
+     time(&temp);
+     timedate = ctime(&temp);
+     length += strlen(timedate);        /* length of date and time in ASCII. */
+-
++    overflow_add(strlen(padding), 4);
++    overflow_add(strlen(histoire), strlen(padding) + 4);
++    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
+     length += strlen(padding) + 3 + strlen(histoire) + 1;
+         /* length of padding, "on "  and length of history name plus "="*/
+     if (in_hdr) /* if we are interested in the old comments... */
+@@ -84,8 +89,10 @@ rle_addhist(char *          argv[],
+     else
+         old = NULL;
+     
+-    if (old && *old)
++    if (old && *old) {
++        overflow_add(length, strlen(old));
+         length += strlen(old);       /* add length if there. */
++    }
+ 
+     ++length;                               /*Cater for the null. */
+ 
+diff -urNp a/urt/rle_getrow.c b/urt/rle_getrow.c
+--- a/urt/rle_getrow.c	2018-07-23 15:03:21.418486701 +0200
++++ b/urt/rle_getrow.c	2018-07-23 15:05:03.072265745 +0200
+@@ -160,6 +160,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
+         char * cp;
+ 
+         VAXSHORT(comlen, infile); /* get comment length */
++        overflow_add(comlen, 1);
+         evenlen = (comlen + 1) & ~1;    /* make it even */
+         if (evenlen) {
+             MALLOCARRAY(comment_buf, evenlen);
+diff -urNp a/urt/rle.h b/urt/rle.h
+--- a/urt/rle.h	2018-07-23 15:03:21.418486701 +0200
++++ b/urt/rle.h	2018-07-23 15:05:03.072265745 +0200
+@@ -161,6 +161,17 @@ rle_hdr             /* End of typedef. *
+  */
+ extern rle_hdr rle_dflt_hdr;
+ 
++/*
++ * Provided by pm library
++ */
++
++extern void overflow_add(int, int);
++#define overflow2(a,b) __overflow2(a,b)
++extern void __overflow2(int, int);
++extern void overflow3(int, int, int);
++extern void *malloc2(int, int);
++extern void *malloc3(int, int, int);
++extern void *realloc2(void *, int, int);
+ 
+ /* Declare RLE library routines. */
+ 
+diff -urNp a/urt/rle_hdr.c b/urt/rle_hdr.c
+--- a/urt/rle_hdr.c	2018-07-23 15:03:21.418486701 +0200
++++ b/urt/rle_hdr.c	2018-07-23 15:05:03.072265745 +0200
+@@ -80,7 +80,10 @@ int img_num;
+     /* Fill in with copies of the strings. */
+     if ( the_hdr->cmd != pgmname )
+     {
+-	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
++        char *tmp;
++
++        overflow_add(strlen(pgmname), 1);
++        tmp = malloc( strlen(pgmname) + 1 );
+ 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
+ 	strcpy( tmp, pgmname );
+ 	the_hdr->cmd = tmp;
+@@ -88,8 +91,10 @@ int img_num;
+ 
+     if ( the_hdr->file_name != fname )
+     {
+-	char *tmp = (char *)malloc( strlen( fname ) + 1 );
+-	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
++        char *tmp;
++        overflow_add(strlen(fname), 1);
++        tmp = malloc( strlen( fname ) + 1 );
++        RLE_CHECK_ALLOC( pgmname, tmp, 0 );
+ 	strcpy( tmp, fname );
+ 	the_hdr->file_name = tmp;
+     }
+@@ -153,6 +158,7 @@ rle_hdr *from_hdr, *to_hdr;
+     if ( to_hdr->bg_color )
+     {
+ 	int size = to_hdr->ncolors * sizeof(int);
++        overflow2(to_hdr->ncolors, sizeof(int));
+ 	to_hdr->bg_color = (int *)malloc( size );
+ 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
+ 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
+@@ -161,7 +167,7 @@ rle_hdr *from_hdr, *to_hdr;
+     if ( to_hdr->cmap )
+     {
+ 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
+-	to_hdr->cmap = (rle_map *)malloc( size );
++        to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
+ 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
+ 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
+     }
+@@ -173,12 +179,17 @@ rle_hdr *from_hdr, *to_hdr;
+     {
+ 	int size = 0;
+ 	CONST_DECL char **cp;
+-	for ( cp=to_hdr->comments; *cp; cp++ )
++        for ( cp=to_hdr->comments; *cp; cp++ )
++        {
++            overflow_add(size, 1);
+ 	    size++;		/* Count the comments. */
++        }
+ 	/* Check if there are really any comments. */
+ 	if ( size )
+ 	{
++            overflow_add(size, 1);
+ 	    size++;		/* Copy the NULL pointer, too. */
++            overflow2(size, sizeof(char *));
+ 	    size *= sizeof(char *);
+ 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
+ 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
+diff -urNp a/urt/rle_open_f.c b/urt/rle_open_f.c
+--- a/urt/rle_open_f.c	2018-07-23 15:03:21.418486701 +0200
++++ b/urt/rle_open_f.c	2018-07-23 15:05:03.072265745 +0200
+@@ -163,65 +163,7 @@ dealWithSubprocess(const char *  const f
+                    FILE **       const fpP,
+                    bool *        const noSubprocessP,
+                    const char ** const errorP) {
+-
+-#ifdef NO_OPEN_PIPES
+     *noSubprocessP = TRUE;
+-#else
+-    const char *cp;
+-
+-    reapChildren(catchingChildrenP, pids);
+-
+-    /*  Real file, not stdin or stdout.  If name ends in ".Z",
+-     *  pipe from/to un/compress (depending on r/w mode).
+-     *  
+-     *  If it starts with "|", popen that command.
+-     */
+-        
+-    cp = file_name + strlen(file_name) - 2;
+-    /* Pipe case. */
+-    if (file_name[0] == '|') {
+-        pid_t thepid;     /* PID from my_popen */
+-
+-        *noSubprocessP = FALSE;
+-
+-        *fpP = my_popen(file_name + 1, mode, &thepid);
+-        if (*fpP == NULL)
+-            *errorP = "%s: can't invoke <<%s>> for %s: ";
+-        else {
+-            /* One more child to catch, eventually. */
+-            if (*catchingChildrenP < MAX_CHILDREN)
+-                pids[(*catchingChildrenP)++] = thepid;
+-        }
+-    } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) {
+-        /* Compress case. */
+-        pid_t thepid;     /* PID from my_popen. */
+-        const char * command;
+-
+-        *noSubprocessP = FALSE;
+-        
+-        if (*mode == 'w')
+-            pm_asprintf(&command, "compress > %s", file_name);
+-        else if (*mode == 'a')
+-            pm_asprintf(&command, "compress >> %s", file_name);
+-        else
+-            pm_asprintf(&command, "compress -d < %s", file_name);
+-        
+-        *fpP = my_popen(command, mode, &thepid);
+-
+-        if (*fpP == NULL)
+-            *errorP = "%s: can't invoke 'compress' program, "
+-                "trying to open %s for %s";
+-        else {
+-            /* One more child to catch, eventually. */
+-            if (*catchingChildrenP < MAX_CHILDREN)
+-                pids[(*catchingChildrenP)++] = thepid;
+-        }
+-        pm_strfree(command);
+-    } else {
+-        *noSubprocessP = TRUE;
+-        *errorP = NULL;
+-    }
+-#endif
+ }
+ 
+ 
+diff -urNp a/urt/rle_putcom.c b/urt/rle_putcom.c
+--- a/urt/rle_putcom.c	2018-07-23 15:03:21.418486701 +0200
++++ b/urt/rle_putcom.c	2018-07-23 15:05:03.072265745 +0200
+@@ -98,12 +98,14 @@ rle_putcom(const char * const value,
+         const char * v;
+         const char ** old_comments;
+         int i;
+-        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
++        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
++            overflow_add(i, 1);
+             if (match(value, *cp) != NULL) {
+                 v = *cp;
+                 *cp = value;
+                 return v;
+             }
++        }
+         /* Not found */
+         /* Can't realloc because somebody else might be pointing to this
+          * comments block.  Of course, if this were true, then the
+diff -urNp a/urt/Runput.c b/urt/Runput.c
+--- a/urt/Runput.c	2018-07-23 15:03:21.418486701 +0200
++++ b/urt/Runput.c	2018-07-23 15:05:03.072265745 +0200
+@@ -202,10 +202,11 @@ RunSetup(rle_hdr * the_hdr)
+     if ( the_hdr->background != 0 )
+     {
+ 	register int i;
+-	register rle_pixel *background =
+-	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
+-	register int *bg_color;
+-	/* 
++        register rle_pixel *background;
++        register int *bg_color;
++
++        overflow_add(the_hdr->ncolors,1);
++        background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );	/*
+ 	 * If even number of bg color bytes, put out one more to get to 
+ 	 * 16 bit boundary.
+ 	 */
+@@ -224,7 +225,7 @@ RunSetup(rle_hdr * the_hdr)
+ 	/* Big-endian machines are harder */
+ 	register int i, nmap = (1 << the_hdr->cmaplen) *
+ 			       the_hdr->ncmap;
+-	register char *h_cmap = (char *)malloc( nmap * 2 );
++        register char *h_cmap = (char *)malloc2( nmap, 2 );
+ 	if ( h_cmap == NULL )
+ 	{
+ 	    fprintf( stderr,
+diff -urNp a/urt/scanargs.c b/urt/scanargs.c
+--- a/urt/scanargs.c	2018-07-23 15:03:21.418486701 +0200
++++ b/urt/scanargs.c	2018-07-23 15:05:03.072265745 +0200
+@@ -62,9 +62,8 @@ typedef int *ptr;
+ /* 
+  * Storage allocation macros
+  */
+-#define NEW( type, cnt )	(type *) malloc( (cnt) * sizeof( type ) )
+-#define RENEW( type, ptr, cnt )	(type *) realloc( ptr, (cnt) * sizeof( type ) )
+-
++#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
++#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
+ static CONST_DECL char * prformat( CONST_DECL char *, int );
+ static int isnum( CONST_DECL char *, int, int );
+ static int	_do_scanargs( int argc, char **argv, CONST_DECL char *format,