cvs: php-src(PHP_5_2) /ext/gd/libgd gd_png.c
| From: | Pierre-Alain Joye | Date: | Sun, 05 Nov 2006 15:04:50 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/gd/libgd gd_png.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41365@lists.php.net to get a copy of this message | ||
pajoye Sun Nov 5 15:04:50 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd/libgd gd_png.c
Log:
- Merge from gd-cvs, initialize the signature not the infile ctx
NB: good that we don't use getC :)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_png.c?r1=1.17.4.2.2.2&r2=1.17.4.2.2.3&diff_format=u
Index: php-src/ext/gd/libgd/gd_png.c
diff -u php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.2 php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.3
--- php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.2 Sat Nov 4 14:34:33 2006
+++ php-src/ext/gd/libgd/gd_png.c Sun Nov 5 15:04:50 2006
@@ -126,7 +126,7 @@
/* Make sure the signature can't match by dumb luck -- TBB */
/* GRR: isn't sizeof(infile) equal to the size of the pointer? */
- memset (infile, 0, sizeof(infile));
+ memset (sig, 0, sizeof(sig));
/* first do a quick check that the file really is a PNG image; could
* have used slightly more general png_sig_cmp() function instead