Fix intermittent segfault in GD library

The gdIOCtx struct should be zero filled with ecalloc. emalloc does not zero fill the struct.
10 years ago · e56fe7e5e7
1 changed files with 2 additions and 2 deletions
--- a/ext/gd/gd_ctx.c
+++ b/ext/gd/gd_ctx.c
@ -152,7 +152,7 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 			RETURN_FALSE;
 		}
 	} else {
-		ctx = emalloc(sizeof(gdIOCtx));
+		ctx = ecalloc(1, sizeof(gdIOCtx));
 		ctx->putC = _php_image_output_putc;
 		ctx->putBuf = _php_image_output_putbuf;
 		ctx->gd_free = _php_image_output_ctxfree;
@ -165,7 +165,7 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 	}

 	if (!ctx)	{
-		ctx = emalloc(sizeof(gdIOCtx));
+		ctx = ecalloc(1, sizeof(gdIOCtx));
 		ctx->putC = _php_image_stream_putc;
 		ctx->putBuf = _php_image_stream_putbuf;
 		if (close_stream) {