Commit:    261e32f6236429fcccf61e80262c9df9589d494c
Author:    Rasmus Lerdorf <ras...@php.net>         Mon, 5 Nov 2012 20:56:19 
-0800
Parents:   7bcb8780e0ed042888f88c78919b7726be9ea931
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=261e32f6236429fcccf61e80262c9df9589d494c

Log:
These need to be volatile in order to prevent leaking after the
longjmp in the error handler

Changed paths:
  M  ext/gd/libgd/gd_png.c


Diff:
diff --git a/ext/gd/libgd/gd_png.c b/ext/gd/libgd/gd_png.c
index 49f7cb0..bdbb7ee 100644
--- a/ext/gd/libgd/gd_png.c
+++ b/ext/gd/libgd/gd_png.c
@@ -127,8 +127,8 @@ gdImagePtr gdImageCreateFromPngCtx (gdIOCtx * infile)
        png_color_16p trans_gray_rgb;
        png_color_16p trans_color_rgb;
        png_bytep trans;
-       png_bytep image_data = NULL;
-       png_bytepp row_pointers = NULL;
+       volatile png_bytep image_data = NULL;
+       volatile png_bytepp row_pointers = NULL;
        gdImagePtr im = NULL;
        int i, j, *open = NULL;
        volatile int transparent = -1;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to