[LIBTIFF]

[reactos.git] / reactos / dll / 3rdparty / libtiff / tif_packbits.c

diff --git a/reactos/dll/3rdparty/libtiff/tif_packbits.c b/reactos/dll/3rdparty/libtiff/tif_packbits.c
index d7a6ff4..e813312 100644 (file)
--- a/reactos/dll/3rdparty/libtiff/tif_packbits.c
+++ b/reactos/dll/3rdparty/libtiff/tif_packbits.c
@@ -1,4 +1,4 @@
-/* $Id: tif_packbits.c,v 1.24 2016-09-04 21:32:56 erouault Exp $ */
+/* $Id: tif_packbits.c,v 1.26 2017-05-14 02:26:07 erouault Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -100,7 +100,7 @@ PackBitsEncode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
                                slop = (long)(op - lastliteral);
                                tif->tif_rawcc += (tmsize_t)(lastliteral - tif->tif_rawcp);
                                if (!TIFFFlushData1(tif))
-                                       return (-1);
+                                       return (0);
                                op = tif->tif_rawcp;
                                while (slop-- > 0)
                                        *op++ = *lastliteral++;
@@ -108,7 +108,7 @@ PackBitsEncode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
                        } else {
                                tif->tif_rawcc += (tmsize_t)(op - tif->tif_rawcp);
                                if (!TIFFFlushData1(tif))
-                                       return (-1);
+                                       return (0);
                                op = tif->tif_rawcp;
                        }
                }
@@ -245,6 +245,12 @@ PackBitsDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s)
                                    (unsigned long) ((tmsize_t)n - occ));
                                n = (long)occ;
                        }
+                       if( cc == 0 )
+                       {
+                               TIFFWarningExt(tif->tif_clientdata, module,
+                                              "Terminating PackBitsDecode due to lack of data.");
+                               break;
+                       }
                        occ -= n;
                        b = *bp++;
                        cc--;