changeset 1173:7f4cf1eb7586

6804996: JWS PNG Decoding Integer Overflow [V-flrhat2ln8] Reviewed-by: prr
author bae
date Fri, 20 Feb 2009 13:48:32 +0300
parents 392c4225d636
children dedf9366f289
files src/share/native/sun/awt/splashscreen/splashscreen_gif.c src/share/native/sun/awt/splashscreen/splashscreen_impl.h src/share/native/sun/awt/splashscreen/splashscreen_png.c
diffstat 3 files changed, 27 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	Wed Feb 18 14:14:03 2009 -0800
+++ b/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	Fri Feb 20 13:48:32 2009 +0300
@@ -53,10 +53,6 @@
 // convert libungif samples to our ones
 #define MAKE_QUAD_GIF(c,a) MAKE_QUAD((c).Red, (c).Green, (c).Blue, (a))
 
-#define SAFE_TO_ALLOC(c, sz)                                               \
-    (((c) > 0) && ((sz) > 0) &&                                            \
-     ((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz)))
-
 /* stdio FILE* and memory input functions for libungif */
 int
 SplashStreamGifInputFunc(GifFileType * gif, GifByteType * buf, int n)
--- a/src/share/native/sun/awt/splashscreen/splashscreen_impl.h	Wed Feb 18 14:14:03 2009 -0800
+++ b/src/share/native/sun/awt/splashscreen/splashscreen_impl.h	Fri Feb 20 13:48:32 2009 +0300
@@ -155,6 +155,10 @@
 
 void SplashInitFrameShape(Splash * splash, int imageIndex);
 
+#define SAFE_TO_ALLOC(c, sz)                                               \
+    (((c) > 0) && ((sz) > 0) &&                                            \
+     ((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz)))
+
 #define dbgprintf printf
 
 #endif
--- a/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Wed Feb 18 14:14:03 2009 -0800
+++ b/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Fri Feb 20 13:48:32 2009 +0300
@@ -103,9 +103,17 @@
 
     rowbytes = png_get_rowbytes(png_ptr, info_ptr);
 
+    if (!SAFE_TO_ALLOC(rowbytes, height)) {
+        goto done;
+    }
+
     if ((image_data = (unsigned char *) malloc(rowbytes * height)) == NULL) {
         goto done;
     }
+
+    if (!SAFE_TO_ALLOC(height, sizeof(png_bytep))) {
+        goto done;
+    }
     if ((row_pointers = (png_bytepp) malloc(height * sizeof(png_bytep)))
             == NULL) {
         goto done;
@@ -121,13 +129,28 @@
     splash->width = width;
     splash->height = height;
 
+    if (!SAFE_TO_ALLOC(splash->width, splash->imageFormat.depthBytes)) {
+        goto done;
+    }
     stride = splash->width * splash->imageFormat.depthBytes;
 
+    if (!SAFE_TO_ALLOC(splash->height, stride)) {
+        goto done;
+    }
     splash->frameCount = 1;
     splash->frames = (SplashImage *)
         malloc(sizeof(SplashImage) * splash->frameCount);
+
+    if (splash->frames == NULL) {
+        goto done;
+    }
+
     splash->loopCount = 1;
     splash->frames[0].bitmapBits = malloc(stride * splash->height);
+    if (splash->frames[0].bitmapBits == NULL) {
+        free(splash->frames);
+        goto done;
+    }
     splash->frames[0].delay = 0;
 
     /* FIXME: sort out the real format */