From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 10 May 2004 22:13:08 +0000 (+0000)
Subject: Fixed crash inside cpdf_place_inline_image() when working with truecolor
X-Git-Tag: RELEASE_0_1~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97d91c76569ef95b9644a77bbc41204f7ff0a01b;p=php

Fixed crash inside cpdf_place_inline_image() when working with truecolor
images.
---

diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index 17663ca7a2..f6162b2efc 100644
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -2056,16 +2056,30 @@ PHP_FUNCTION(cpdf_place_inline_image)
 	}
 
 	count = 3 * im->sx * im->sy;
-	if(NULL == (buffer = (unsigned char *) emalloc(count)))
-		RETURN_FALSE;
+	buffer = (unsigned char *) safe_emalloc(3 * im->sx, im->sy, 0);
 
 	ptr = buffer;
 	for(i=0; i<im->sy; i++) {
 		for(j=0; j<im->sx; j++) {
-			color = im->pixels[i][j];
-			*ptr++ = im->red[color];
-			*ptr++ = im->green[color];
-			*ptr++ = im->blue[color];
+#if HAVE_LIBGD20
+			if(gdImageTrueColor(im)) {
+				if (im->tpixels && gdImageBoundsSafe(im, j, i)) {
+					color = gdImageTrueColorPixel(im, j, i);
+					*ptr++ = (color >> 16) & 0xFF;
+					*ptr++ = (color >> 8) & 0xFF;
+					*ptr++ = color & 0xFF;
+				}
+			} else {
+#endif
+				if (im->pixels && gdImageBoundsSafe(im, j, i)) {
+					color = im->pixels[i][j];
+					*ptr++ = im->red[color];
+					*ptr++ = im->green[color];
+					*ptr++ = im->blue[color];
+				}
+#if HAVE_LIBGD20
+			}
+#endif
 		}
 	}