]> git.ipfire.org Git - thirdparty/HylaFAX.git/commitdiff
Fix memory corruption when using libtiff v4.0 or newer
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 31 Jul 2014 12:58:08 +0000 (14:58 +0200)
committerPatrice Fournier <pfournier@ifax.com>
Thu, 31 Jul 2014 15:12:44 +0000 (11:12 -0400)
One tag was missed when adapting to
libtiff v4.0 uint64 data types.

Upstream libtiff documents the following tags as changed:
   TIFFTAG_FREEBYTECOUNTS
   TIFFTAG_FREEOFFSETS

   TIFFTAG_STRIPBYTECOUNTS
   TIFFTAG_STRIPOFFSETS

   TIFFTAG_TILEBYTECOUNTS
   TIFFTAG_TILEOFFSETS

faxd/FaxModem.h

index 4090ebe81bf55870137c238f220859f4040bb730..ac2c1eb8449f648468b5eed982ec87675f24e210 100644 (file)
@@ -82,7 +82,7 @@ private:
     tstrip_t   recvStrip;      // current strip number during receive
     u_char*    recvRow;        // current receive row raster
     u_char*    recvPageStart;  // pointer to start of page buffer
-    u_long*    savedWriteOff;  // file offset at start of page data
+    tiff_offset_t*     savedWriteOff;  // file offset at start of page data
     tiff_bytecount_t*  savedStripByteCounts;   // byte counts at start of page data
     int                decodedPixels;  // number of pixels decoded with error
     int                decoderFd[2];   // file descriptors for the decoder pipe