Added wxRichTextTableBlock class to help with table UI operations

[wxWidgets.git] / src / tiff / tools / rgb2ycbcr.c

diff --git a/src/tiff/tools/rgb2ycbcr.c b/src/tiff/tools/rgb2ycbcr.c
index 0c41c3e997cf448e142aa64496771f537db519b8..657217e62785e4e03eba26c6944745638c3900b1 100644 (file)
--- a/src/tiff/tools/rgb2ycbcr.c
+++ b/src/tiff/tools/rgb2ycbcr.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
@@ -34,6 +33,11 @@
 # include <unistd.h>
 #endif
 
+#ifdef NEED_LIBPORT
+# include "libport.h"
+#endif
+
+#include "tiffiop.h"
 #include "tiffio.h"
 
 #define        streq(a,b)      (strcmp(a,b) == 0)
@@ -254,6 +258,7 @@ cvtRaster(TIFF* tif, uint32* raster, uint32 width, uint32 height)
        cc = rnrows*rwidth +
            2*((rnrows*rwidth) / (horizSubSampling*vertSubSampling));
        buf = (unsigned char*)_TIFFmalloc(cc);
+       // FIXME unchecked malloc
        for (y = height; (int32) y > 0; y -= nrows) {
                uint32 nr = (y > nrows ? nrows : y);
                cvtStrip(buf, raster + (y-1)*width, nr, width);
@@ -278,14 +283,32 @@ tiffcvt(TIFF* in, TIFF* out)
        float floatv;
        char *stringv;
        uint32 longv;
+       int result;
+       size_t pixel_count;
 
        TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
        TIFFGetField(in, TIFFTAG_IMAGELENGTH, &height);
-       raster = (uint32*)_TIFFmalloc(width * height * sizeof (uint32));
-       if (raster == 0) {
-               TIFFError(TIFFFileName(in), "No space for raster buffer");
-               return (0);
-       }
+       pixel_count = width * height;
+
+       /* XXX: Check the integer overflow. */
+       if (!width || !height || pixel_count / width != height) {
+               TIFFError(TIFFFileName(in),
+                         "Malformed input file; "
+                         "can't allocate buffer for raster of %lux%lu size",
+                         (unsigned long)width, (unsigned long)height);
+               return 0;
+       }
+ 
+       raster = (uint32*)_TIFFCheckMalloc(in, pixel_count, sizeof(uint32),
+                                          "raster buffer");
+       if (raster == 0) {
+               TIFFError(TIFFFileName(in),
+                         "Failed to allocate buffer (%lu elements of %lu each)",
+                         (unsigned long)pixel_count,
+                         (unsigned long)sizeof(uint32));
+               return (0);
+       }
+
        if (!TIFFReadRGBAImage(in, width, height, raster, 0)) {
                _TIFFfree(raster);
                return (0);
@@ -322,7 +345,9 @@ tiffcvt(TIFF* in, TIFF* out)
        rowsperstrip = TIFFDefaultStripSize(out, rowsperstrip);
        TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, rowsperstrip);
 
-       return (cvtRaster(out, raster, width, height));
+       result = cvtRaster(out, raster, width, height);
+        _TIFFfree(raster);
+        return result;
 }
 
 char* stuff[] = {
@@ -355,3 +380,10 @@ usage(int code)
 }
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */