[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/libgd gd_gd.c /ext/gd/tests libgd00101.gd libgd00101.phpt

[Mattias Bengtsson]

mattias         Thu Aug  9 14:21:38 2007 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/gd/tests       libgd00101.phpt libgd00101.gd 

  Modified files:              
    /php-src/ext/gd/libgd       gd_gd.c 
  Log:
  - libgd #101, imagecreatefromgd can crash if gdImageCreate fails
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gd.c?r1=1.8&r2=1.8.6.1&diff_format=u
Index: php-src/ext/gd/libgd/gd_gd.c
diff -u php-src/ext/gd/libgd/gd_gd.c:1.8 php-src/ext/gd/libgd/gd_gd.c:1.8.6.1
--- php-src/ext/gd/libgd/gd_gd.c:1.8    Mon Mar 29 18:20:33 2004
+++ php-src/ext/gd/libgd/gd_gd.c        Thu Aug  9 14:21:38 2007
@@ -122,6 +122,9 @@
        } else {
                im = gdImageCreate(*sx, *sy);
        }
+       if(!im) {
+               goto fail1;
+       }
        if (!_gdGetColors(in, im, gd2xFlag)) {
                goto fail2;
        }

http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00101.phpt?view=markup&rev=1.1
Index: php-src/ext/gd/tests/libgd00101.phpt
+++ php-src/ext/gd/tests/libgd00101.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00101.gd?view=markup&rev=1.1
Index: php-src/ext/gd/tests/libgd00101.gd
+++ php-src/ext/gd/tests/libgd00101.gd

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