cvs: gd(GD_2_0) /libgd/src gd_gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_jpeg.c gd_png.c gd_wbmp.c /libgd/src/tests CMakeLists.txt
Makefile.am /libgd/src/tests/gd CMakeLists.txt Makefile.am gd_null.c /libgd/src/tests/gd2 CMakeLists.txt Makefile.am gd2_null.c
/libgd/src/tests/gdnewfilectx CMakeLists.txt Makefile.am gdnewfilectx_null.c /libgd/src/tests/gif CMakeLists.txt Makefile.am gif_null.c
/libgd/src/tests/jpeg CMakeLists.txt Makefile.am jpeg_null.c /libgd/src/tests/png CMakeLists.txt Makefile.am png_null.c /libgd/src/tests/wbmp
CMakeLists.txt Makefile.am wbmp_null.c
| From: | Takeshi Abe | Date: | Fri, 19 Jun 2009 17:30:37 +0000 |
| Subject: | cvs: gd(GD_2_0) /libgd/src gd_gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_jpeg.c gd_png.c gd_wbmp.c /libgd/src/tests CMakeLists.txt Makefile.am /libgd/src/tests/gd CMakeLists.txt Makefile.am gd_null.c /libgd/src/tests/gd2 CMakeLists.txt Makefile.am gd2_null.c /libgd/src/tests/gdnewfilectx CMakeLists.txt Makefile.am gdnewfilectx_null.c /libgd/src/tests/gif CMakeLists.txt Makefile.am gif_null.c /libgd/src/tests/jpeg CMakeLists.txt Makefile.am jpeg_null.c /libgd/src/tests/png CMakeLists.txt Makefile.am png_null.c /libgd/src/tests/wbmp CMakeLists.txt Makefile.am wbmp_null.c |
||
| Groups: | php.gd.cvs | ||
| Request: | Send a blank email to php-gd-cvs+get-618@lists.php.net to get a copy of this message | ||
tabe Fri Jun 19 17:30:37 2009 UTC
Added files: (Branch: GD_2_0)
/gd/libgd/src/tests/gd CMakeLists.txt Makefile.am gd_null.c
/gd/libgd/src/tests/gd2 gd2_null.c
/gd/libgd/src/tests/gdnewfilectx CMakeLists.txt Makefile.am
gdnewfilectx_null.c
/gd/libgd/src/tests/gif gif_null.c
/gd/libgd/src/tests/jpeg jpeg_null.c
/gd/libgd/src/tests/png png_null.c
/gd/libgd/src/tests/wbmp CMakeLists.txt Makefile.am wbmp_null.c
Modified files:
/gd/libgd/src gd_gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c
gd_io_file.c gd_jpeg.c gd_png.c gd_wbmp.c
/gd/libgd/src/tests CMakeLists.txt Makefile.am
/gd/libgd/src/tests/gd2 CMakeLists.txt Makefile.am
/gd/libgd/src/tests/gif CMakeLists.txt Makefile.am
/gd/libgd/src/tests/jpeg CMakeLists.txt Makefile.am
/gd/libgd/src/tests/png CMakeLists.txt Makefile.am
Log:
MFH: fix for FS#204
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd.c?r1=1.11.2.3&r2=1.11.2.4&diff_format=u Index: gd/libgd/src/gd_gd.c diff -u gd/libgd/src/gd_gd.c:1.11.2.3 gd/libgd/src/gd_gd.c:1.11.2.4 --- gd/libgd/src/gd_gd.c:1.11.2.3 Tue Feb 24 07:59:38 2009 +++ gd/libgd/src/gd_gd.c Fri Jun 19 17:30:36 2009 @@ -171,6 +171,7 @@ gdIOCtx *in; in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGdCtx (in); in->gd_free (in); @@ -316,6 +317,7 @@ BGD_DECLARE(void) gdImageGd (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd (im, out); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd2.c?r1=1.21.2.2&r2=1.21.2.3&diff_format=u Index: gd/libgd/src/gd_gd2.c diff -u gd/libgd/src/gd_gd2.c:1.21.2.2 gd/libgd/src/gd_gd2.c:1.21.2.3 --- gd/libgd/src/gd_gd2.c:1.21.2.2 Sun Nov 25 19:39:56 2007 +++ gd/libgd/src/gd_gd2.c Fri Jun 19 17:30:36 2009 @@ -282,6 +282,7 @@ gdIOCtx *in = gdNewFileCtx (inFile); gdImagePtr im; + if (in == NULL) return NULL; im = gdImageCreateFromGd2Ctx (in); in->gd_free (in); @@ -492,6 +493,7 @@ gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGd2PartCtx (in, srcx, srcy, w, h); in->gd_free (in); @@ -1045,6 +1047,7 @@ BGD_DECLARE(void) gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd2 (im, out, cs, fmt); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_in.c?r1=1.5.2.8&r2=1.5.2.9&diff_format=u Index: gd/libgd/src/gd_gif_in.c diff -u gd/libgd/src/gd_gif_in.c:1.5.2.8 gd/libgd/src/gd_gif_in.c:1.5.2.9 --- gd/libgd/src/gd_gif_in.c:1.5.2.8 Tue Aug 7 19:54:24 2007 +++ gd/libgd/src/gd_gif_in.c Fri Jun 19 17:30:36 2009 @@ -97,8 +97,9 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGif(FILE *fdFile) { gdIOCtx *fd = gdNewFileCtx(fdFile); - gdImagePtr im = 0; + gdImagePtr im; + if (fd == NULL) return NULL; im = gdImageCreateFromGifCtx(fd); fd->gd_free(fd); http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_out.c?r1=1.6.2.1&r2=1.6.2.2&diff_format=u Index: gd/libgd/src/gd_gif_out.c diff -u gd/libgd/src/gd_gif_out.c:1.6.2.1 gd/libgd/src/gd_gif_out.c:1.6.2.2 --- gd/libgd/src/gd_gif_out.c:1.6.2.1 Mon Nov 3 13:33:02 2008 +++ gd/libgd/src/gd_gif_out.c Fri Jun 19 17:30:36 2009 @@ -112,6 +112,7 @@ BGD_DECLARE(void) gdImageGif (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifCtx (im, out); out->gd_free (out); } @@ -156,6 +157,7 @@ BGD_DECLARE(void) gdImageGifAnimBegin (gdImagePtr im, FILE *outFile, int GlobalCM, int Loops) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifAnimBeginCtx (im, out, GlobalCM, Loops); out->gd_free (out); } @@ -252,6 +254,7 @@ BGD_DECLARE(void) gdImageGifAnimAdd (gdImagePtr im, FILE * outFile, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal, gdImagePtr previm) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifAnimAddCtx (im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal, previm); out->gd_free (out); } @@ -438,6 +441,7 @@ putc (';', outFile); #else gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifAnimEndCtx (out); out->gd_free (out); #endif http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_io_file.c?r1=1.10&r2=1.10.2.1&diff_format=u Index: gd/libgd/src/gd_io_file.c diff -u gd/libgd/src/gd_io_file.c:1.10 gd/libgd/src/gd_io_file.c:1.10.2.1 --- gd/libgd/src/gd_io_file.c:1.10 Wed Apr 5 15:52:22 2006 +++ gd/libgd/src/gd_io_file.c Fri Jun 19 17:30:36 2009 @@ -55,6 +55,7 @@ { fileIOCtx *ctx; + if (f == NULL) return NULL; ctx = (fileIOCtx *) gdMalloc (sizeof (fileIOCtx)); if (ctx == NULL) { http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_jpeg.c?r1=1.19.2.1&r2=1.19.2.2&diff_format=u Index: gd/libgd/src/gd_jpeg.c diff -u gd/libgd/src/gd_jpeg.c:1.19.2.1 gd/libgd/src/gd_jpeg.c:1.19.2.2 --- gd/libgd/src/gd_jpeg.c:1.19.2.1 Tue Aug 7 19:50:39 2007 +++ gd/libgd/src/gd_jpeg.c Fri Jun 19 17:30:36 2009 @@ -95,6 +95,7 @@ BGD_DECLARE(void) gdImageJpeg (gdImagePtr im, FILE * outFile, int quality) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageJpegCtx (im, out, quality); out->gd_free (out); } @@ -266,6 +267,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromJpegCtx (in); in->gd_free (in); return im; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_png.c?r1=1.21.2.8&r2=1.21.2.9&diff_format=u Index: gd/libgd/src/gd_png.c diff -u gd/libgd/src/gd_png.c:1.21.2.8 gd/libgd/src/gd_png.c:1.21.2.9 --- gd/libgd/src/gd_png.c:1.21.2.8 Tue Mar 31 16:26:36 2009 +++ gd/libgd/src/gd_png.c Fri Jun 19 17:30:36 2009 @@ -1,4 +1,4 @@ -/* $Id: gd_png.c,v 1.21.2.8 2009/03/31 16:26:36 tabe Exp $ */ +/* $Id: gd_png.c,v 1.21.2.9 2009/06/19 17:30:36 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -101,6 +101,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromPngCtx (in); in->gd_free (in); return im; @@ -454,6 +455,7 @@ BGD_DECLARE(void) gdImagePngEx (gdImagePtr im, FILE * outFile, int level) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, level); out->gd_free (out); } @@ -461,6 +463,7 @@ BGD_DECLARE(void) gdImagePng (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, -1); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_wbmp.c?r1=1.10.2.2&r2=1.10.2.3&diff_format=u Index: gd/libgd/src/gd_wbmp.c diff -u gd/libgd/src/gd_wbmp.c:1.10.2.2 gd/libgd/src/gd_wbmp.c:1.10.2.3 --- gd/libgd/src/gd_wbmp.c:1.10.2.2 Wed Oct 24 13:50:31 2007 +++ gd/libgd/src/gd_wbmp.c Fri Jun 19 17:30:36 2009 @@ -192,6 +192,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromWBMPCtx (in); in->gd_free (in); return (im); @@ -214,6 +215,7 @@ BGD_DECLARE(void) gdImageWBMP (gdImagePtr im, int fg, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageWBMPCtx (im, fg, out); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/CMakeLists.txt?r1=1.1.2.9&r2=1.1.2.10&diff_format=u Index: gd/libgd/src/tests/CMakeLists.txt diff -u gd/libgd/src/tests/CMakeLists.txt:1.1.2.9 gd/libgd/src/tests/CMakeLists.txt:1.1.2.10 --- gd/libgd/src/tests/CMakeLists.txt:1.1.2.9 Tue May 5 17:36:27 2009 +++ gd/libgd/src/tests/CMakeLists.txt Fri Jun 19 17:30:36 2009 @@ -29,6 +29,7 @@ SET(TESTS_DIRS gdtest freetype + gd gd2 gdimagearc gdimagecolorclosest @@ -48,10 +49,12 @@ gdimagesetpixel gdimagestringft gdimagestringftex + gdnewfilectx gdtiled gif jpeg png + wbmp xpm ) http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/Makefile.am?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: gd/libgd/src/tests/Makefile.am diff -u gd/libgd/src/tests/Makefile.am:1.1.2.6 gd/libgd/src/tests/Makefile.am:1.1.2.7 --- gd/libgd/src/tests/Makefile.am:1.1.2.6 Tue May 5 17:36:27 2009 +++ gd/libgd/src/tests/Makefile.am Fri Jun 19 17:30:36 2009 @@ -3,6 +3,7 @@ SUBDIRS = gdtest \ freetype \ + gd \ gd2 \ gdimagearc \ gdimagecolorclosest \ @@ -21,10 +22,12 @@ gdimagesetpixel \ gdimagestringft \ gdimagestringftex \ + gdnewfilectx \ gdtiled \ gif \ jpeg \ png \ + wbmp \ xpm EXTRA_DIST = CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/CMakeLists.txt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: gd/libgd/src/tests/gd2/CMakeLists.txt diff -u gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.3 gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.4 --- gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.3 Wed Jan 7 15:12:51 2009 +++ gd/libgd/src/tests/gd2/CMakeLists.txt Fri Jun 19 17:30:36 2009 @@ -2,6 +2,7 @@ SET(TESTS_FILES gd2_read gd2_empty_file + gd2_null ) FOREACH(test_name ${TESTS_FILES}) http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/Makefile.am?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: gd/libgd/src/tests/gd2/Makefile.am diff -u gd/libgd/src/tests/gd2/Makefile.am:1.1.2.2 gd/libgd/src/tests/gd2/Makefile.am:1.1.2.3 --- gd/libgd/src/tests/gd2/Makefile.am:1.1.2.2 Wed Mar 18 14:29:00 2009 +++ gd/libgd/src/tests/gd2/Makefile.am Fri Jun 19 17:30:36 2009 @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_read.c +EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_read.c gd2_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/CMakeLists.txt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: gd/libgd/src/tests/gif/CMakeLists.txt diff -u gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.6 gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.7 --- gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.6 Wed Jan 7 15:12:51 2009 +++ gd/libgd/src/tests/gif/CMakeLists.txt Fri Jun 19 17:30:37 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + gif_null bug00005 bug00005_2 bug00006 http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/Makefile.am?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: gd/libgd/src/tests/gif/Makefile.am diff -u gd/libgd/src/tests/gif/Makefile.am:1.1.2.2 gd/libgd/src/tests/gif/Makefile.am:1.1.2.3 --- gd/libgd/src/tests/gif/Makefile.am:1.1.2.2 Mon Nov 3 13:33:02 2008 +++ gd/libgd/src/tests/gif/Makefile.am Fri Jun 19 17:30:37 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif bug00005_2_exp.png bug00005_3.gif bug00006.c bug00060.gif bug00066_exp.png bug00181.c +EXTRA_DIST = CMakeLists.txt gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif bug00005_2_exp.png bug00005_3.gif bug00006.c bug00060.gif bug00066_exp.png bug00181.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/CMakeLists.txt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: gd/libgd/src/tests/jpeg/CMakeLists.txt diff -u gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.3 gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.4 --- gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.3 Wed Jan 7 15:12:51 2009 +++ gd/libgd/src/tests/jpeg/CMakeLists.txt Fri Jun 19 17:30:37 2009 @@ -2,6 +2,7 @@ SET(TESTS_FILES jpeg_read jpeg_empty_file + jpeg_null ) FOREACH(test_name ${TESTS_FILES}) http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/Makefile.am?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: gd/libgd/src/tests/jpeg/Makefile.am diff -u gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.1 gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.2 --- gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.1 Mon Mar 10 12:33:36 2008 +++ gd/libgd/src/tests/jpeg/Makefile.am Fri Jun 19 17:30:37 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_read.c +EXTRA_DIST = CMakeLists.txt conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_null.c jpeg_read.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/CMakeLists.txt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: gd/libgd/src/tests/png/CMakeLists.txt diff -u gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.6 gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.7 --- gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.6 Fri Mar 13 20:26:55 2009 +++ gd/libgd/src/tests/png/CMakeLists.txt Fri Jun 19 17:30:37 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + png_null bug00011 bug00033 bug00086 http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/Makefile.am?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: gd/libgd/src/tests/png/Makefile.am diff -u gd/libgd/src/tests/png/Makefile.am:1.1.2.2 gd/libgd/src/tests/png/Makefile.am:1.1.2.3 --- gd/libgd/src/tests/png/Makefile.am:1.1.2.2 Fri Mar 13 20:26:55 2009 +++ gd/libgd/src/tests/png/Makefile.am Fri Jun 19 17:30:37 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png bug00193.c emptyfile +EXTRA_DIST = CMakeLists.txt png_null.c bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png bug00193.c emptyfile http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd/CMakeLists.txt +++ gd/libgd/src/tests/gd/CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd/Makefile.am +++ gd/libgd/src/tests/gd/Makefile.am http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/gd_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd/gd_null.c +++ gd/libgd/src/tests/gd/gd_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/gd2_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd2/gd2_null.c +++ gd/libgd/src/tests/gd2/gd2_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdnewfilectx/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/src/tests/gdnewfilectx/CMakeLists.txt +++ gd/libgd/src/tests/gdnewfilectx/CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdnewfilectx/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/src/tests/gdnewfilectx/Makefile.am +++ gd/libgd/src/tests/gdnewfilectx/Makefile.am http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdnewfilectx/gdnewfilectx_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gdnewfilectx/gdnewfilectx_null.c +++ gd/libgd/src/tests/gdnewfilectx/gdnewfilectx_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/gif_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gif/gif_null.c +++ gd/libgd/src/tests/gif/gif_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/jpeg_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/jpeg/jpeg_null.c +++ gd/libgd/src/tests/jpeg/jpeg_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/png_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/png/png_null.c +++ gd/libgd/src/tests/png/png_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/src/tests/wbmp/CMakeLists.txt +++ gd/libgd/src/tests/wbmp/CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/src/tests/wbmp/Makefile.am +++ gd/libgd/src/tests/wbmp/Makefile.am http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/wbmp_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/wbmp/wbmp_null.c +++ gd/libgd/src/tests/wbmp/wbmp_null.c
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd.c?r1=1.11.2.3&r2=1.11.2.4&diff_format=u Index: gd/libgd/src/gd_gd.c diff -u gd/libgd/src/gd_gd.c:1.11.2.3 gd/libgd/src/gd_gd.c:1.11.2.4 --- gd/libgd/src/gd_gd.c:1.11.2.3 Tue Feb 24 07:59:38 2009 +++ gd/libgd/src/gd_gd.c Fri Jun 19 17:30:36 2009 @@ -171,6 +171,7 @@ gdIOCtx *in; in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGdCtx (in); in->gd_free (in); @@ -316,6 +317,7 @@ BGD_DECLARE(void) gdImageGd (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd (im, out); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd2.c?r1=1.21.2.2&r2=1.21.2.3&diff_format=u Index: gd/libgd/src/gd_gd2.c diff -u gd/libgd/src/gd_gd2.c:1.21.2.2 gd/libgd/src/gd_gd2.c:1.21.2.3 --- gd/libgd/src/gd_gd2.c:1.21.2.2 Sun Nov 25 19:39:56 2007 +++ gd/libgd/src/gd_gd2.c Fri Jun 19 17:30:36 2009 @@ -282,6 +282,7 @@ gdIOCtx *in = gdNewFileCtx (inFile); gdImagePtr im; + if (in == NULL) return NULL; im = gdImageCreateFromGd2Ctx (in); in->gd_free (in); @@ -492,6 +493,7 @@ gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGd2PartCtx (in, srcx, srcy, w, h); in->gd_free (in); @@ -1045,6 +1047,7 @@ BGD_DECLARE(void) gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd2 (im, out, cs, fmt); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_in.c?r1=1.5.2.8&r2=1.5.2.9&diff_format=u Index: gd/libgd/src/gd_gif_in.c diff -u gd/libgd/src/gd_gif_in.c:1.5.2.8 gd/libgd/src/gd_gif_in.c:1.5.2.9 --- gd/libgd/src/gd_gif_in.c:1.5.2.8 Tue Aug 7 19:54:24 2007 +++ gd/libgd/src/gd_gif_in.c Fri Jun 19 17:30:36 2009 @@ -97,8 +97,9 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGif(FILE *fdFile) { gdIOCtx *fd = gdNewFileCtx(fdFile); - gdImagePtr im = 0; + gdImagePtr im; + if (fd == NULL) return NULL; im = gdImageCreateFromGifCtx(fd); fd->gd_free(fd); http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_out.c?r1=1.6.2.1&r2=1.6.2.2&diff_format=u Index: gd/libgd/src/gd_gif_out.c diff -u gd/libgd/src/gd_gif_out.c:1.6.2.1 gd/libgd/src/gd_gif_out.c:1.6.2.2 --- gd/libgd/src/gd_gif_out.c:1.6.2.1 Mon Nov 3 13:33:02 2008 +++ gd/libgd/src/gd_gif_out.c Fri Jun 19 17:30:36 2009 @@ -112,6 +112,7 @@ BGD_DECLARE(void) gdImageGif (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifCtx (im, out); out->gd_free (out); } @@ -156,6 +157,7 @@ BGD_DECLARE(void) gdImageGifAnimBegin (gdImagePtr im, FILE *outFile, int GlobalCM, int Loops) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifAnimBeginCtx (im, out, GlobalCM, Loops); out->gd_free (out); } @@ -252,6 +254,7 @@ BGD_DECLARE(void) gdImageGifAnimAdd (gdImagePtr im, FILE * outFile, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal, gdImagePtr previm) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifAnimAddCtx (im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal, previm); out->gd_free (out); } @@ -438,6 +441,7 @@ putc (';', outFile); #else gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageGifAnimEndCtx (out); out->gd_free (out); #endif http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_io_file.c?r1=1.10&r2=1.10.2.1&diff_format=u Index: gd/libgd/src/gd_io_file.c diff -u gd/libgd/src/gd_io_file.c:1.10 gd/libgd/src/gd_io_file.c:1.10.2.1 --- gd/libgd/src/gd_io_file.c:1.10 Wed Apr 5 15:52:22 2006 +++ gd/libgd/src/gd_io_file.c Fri Jun 19 17:30:36 2009 @@ -55,6 +55,7 @@ { fileIOCtx *ctx; + if (f == NULL) return NULL; ctx = (fileIOCtx *) gdMalloc (sizeof (fileIOCtx)); if (ctx == NULL) { http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_jpeg.c?r1=1.19.2.1&r2=1.19.2.2&diff_format=u Index: gd/libgd/src/gd_jpeg.c diff -u gd/libgd/src/gd_jpeg.c:1.19.2.1 gd/libgd/src/gd_jpeg.c:1.19.2.2 --- gd/libgd/src/gd_jpeg.c:1.19.2.1 Tue Aug 7 19:50:39 2007 +++ gd/libgd/src/gd_jpeg.c Fri Jun 19 17:30:36 2009 @@ -95,6 +95,7 @@ BGD_DECLARE(void) gdImageJpeg (gdImagePtr im, FILE * outFile, int quality) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageJpegCtx (im, out, quality); out->gd_free (out); } @@ -266,6 +267,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromJpegCtx (in); in->gd_free (in); return im; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_png.c?r1=1.21.2.8&r2=1.21.2.9&diff_format=u Index: gd/libgd/src/gd_png.c diff -u gd/libgd/src/gd_png.c:1.21.2.8 gd/libgd/src/gd_png.c:1.21.2.9 --- gd/libgd/src/gd_png.c:1.21.2.8 Tue Mar 31 16:26:36 2009 +++ gd/libgd/src/gd_png.c Fri Jun 19 17:30:36 2009 @@ -1,4 +1,4 @@ -/* $Id: gd_png.c,v 1.21.2.8 2009/03/31 16:26:36 tabe Exp $ */ +/* $Id: gd_png.c,v 1.21.2.9 2009/06/19 17:30:36 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -101,6 +101,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromPngCtx (in); in->gd_free (in); return im; @@ -454,6 +455,7 @@ BGD_DECLARE(void) gdImagePngEx (gdImagePtr im, FILE * outFile, int level) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, level); out->gd_free (out); } @@ -461,6 +463,7 @@ BGD_DECLARE(void) gdImagePng (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, -1); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_wbmp.c?r1=1.10.2.2&r2=1.10.2.3&diff_format=u Index: gd/libgd/src/gd_wbmp.c diff -u gd/libgd/src/gd_wbmp.c:1.10.2.2 gd/libgd/src/gd_wbmp.c:1.10.2.3 --- gd/libgd/src/gd_wbmp.c:1.10.2.2 Wed Oct 24 13:50:31 2007 +++ gd/libgd/src/gd_wbmp.c Fri Jun 19 17:30:36 2009 @@ -192,6 +192,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromWBMPCtx (in); in->gd_free (in); return (im); @@ -214,6 +215,7 @@ BGD_DECLARE(void) gdImageWBMP (gdImagePtr im, int fg, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImageWBMPCtx (im, fg, out); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/CMakeLists.txt?r1=1.1.2.9&r2=1.1.2.10&diff_format=u Index: gd/libgd/src/tests/CMakeLists.txt diff -u gd/libgd/src/tests/CMakeLists.txt:1.1.2.9 gd/libgd/src/tests/CMakeLists.txt:1.1.2.10 --- gd/libgd/src/tests/CMakeLists.txt:1.1.2.9 Tue May 5 17:36:27 2009 +++ gd/libgd/src/tests/CMakeLists.txt Fri Jun 19 17:30:36 2009 @@ -29,6 +29,7 @@ SET(TESTS_DIRS gdtest freetype + gd gd2 gdimagearc gdimagecolorclosest @@ -48,10 +49,12 @@ gdimagesetpixel gdimagestringft gdimagestringftex + gdnewfilectx gdtiled gif jpeg png + wbmp xpm ) http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/Makefile.am?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: gd/libgd/src/tests/Makefile.am diff -u gd/libgd/src/tests/Makefile.am:1.1.2.6 gd/libgd/src/tests/Makefile.am:1.1.2.7 --- gd/libgd/src/tests/Makefile.am:1.1.2.6 Tue May 5 17:36:27 2009 +++ gd/libgd/src/tests/Makefile.am Fri Jun 19 17:30:36 2009 @@ -3,6 +3,7 @@ SUBDIRS = gdtest \ freetype \ + gd \ gd2 \ gdimagearc \ gdimagecolorclosest \ @@ -21,10 +22,12 @@ gdimagesetpixel \ gdimagestringft \ gdimagestringftex \ + gdnewfilectx \ gdtiled \ gif \ jpeg \ png \ + wbmp \ xpm EXTRA_DIST = CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/CMakeLists.txt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: gd/libgd/src/tests/gd2/CMakeLists.txt diff -u gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.3 gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.4 --- gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.3 Wed Jan 7 15:12:51 2009 +++ gd/libgd/src/tests/gd2/CMakeLists.txt Fri Jun 19 17:30:36 2009 @@ -2,6 +2,7 @@ SET(TESTS_FILES gd2_read gd2_empty_file + gd2_null ) FOREACH(test_name ${TESTS_FILES}) http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/Makefile.am?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: gd/libgd/src/tests/gd2/Makefile.am diff -u gd/libgd/src/tests/gd2/Makefile.am:1.1.2.2 gd/libgd/src/tests/gd2/Makefile.am:1.1.2.3 --- gd/libgd/src/tests/gd2/Makefile.am:1.1.2.2 Wed Mar 18 14:29:00 2009 +++ gd/libgd/src/tests/gd2/Makefile.am Fri Jun 19 17:30:36 2009 @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_read.c +EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_read.c gd2_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/CMakeLists.txt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: gd/libgd/src/tests/gif/CMakeLists.txt diff -u gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.6 gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.7 --- gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.6 Wed Jan 7 15:12:51 2009 +++ gd/libgd/src/tests/gif/CMakeLists.txt Fri Jun 19 17:30:37 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + gif_null bug00005 bug00005_2 bug00006 http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/Makefile.am?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: gd/libgd/src/tests/gif/Makefile.am diff -u gd/libgd/src/tests/gif/Makefile.am:1.1.2.2 gd/libgd/src/tests/gif/Makefile.am:1.1.2.3 --- gd/libgd/src/tests/gif/Makefile.am:1.1.2.2 Mon Nov 3 13:33:02 2008 +++ gd/libgd/src/tests/gif/Makefile.am Fri Jun 19 17:30:37 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif bug00005_2_exp.png bug00005_3.gif bug00006.c bug00060.gif bug00066_exp.png bug00181.c +EXTRA_DIST = CMakeLists.txt gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif bug00005_2_exp.png bug00005_3.gif bug00006.c bug00060.gif bug00066_exp.png bug00181.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/CMakeLists.txt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: gd/libgd/src/tests/jpeg/CMakeLists.txt diff -u gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.3 gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.4 --- gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.3 Wed Jan 7 15:12:51 2009 +++ gd/libgd/src/tests/jpeg/CMakeLists.txt Fri Jun 19 17:30:37 2009 @@ -2,6 +2,7 @@ SET(TESTS_FILES jpeg_read jpeg_empty_file + jpeg_null ) FOREACH(test_name ${TESTS_FILES}) http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/Makefile.am?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: gd/libgd/src/tests/jpeg/Makefile.am diff -u gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.1 gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.2 --- gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.1 Mon Mar 10 12:33:36 2008 +++ gd/libgd/src/tests/jpeg/Makefile.am Fri Jun 19 17:30:37 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_read.c +EXTRA_DIST = CMakeLists.txt conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_null.c jpeg_read.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/CMakeLists.txt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: gd/libgd/src/tests/png/CMakeLists.txt diff -u gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.6 gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.7 --- gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.6 Fri Mar 13 20:26:55 2009 +++ gd/libgd/src/tests/png/CMakeLists.txt Fri Jun 19 17:30:37 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + png_null bug00011 bug00033 bug00086 http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/Makefile.am?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: gd/libgd/src/tests/png/Makefile.am diff -u gd/libgd/src/tests/png/Makefile.am:1.1.2.2 gd/libgd/src/tests/png/Makefile.am:1.1.2.3 --- gd/libgd/src/tests/png/Makefile.am:1.1.2.2 Fri Mar 13 20:26:55 2009 +++ gd/libgd/src/tests/png/Makefile.am Fri Jun 19 17:30:37 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png bug00193.c emptyfile +EXTRA_DIST = CMakeLists.txt png_null.c bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png bug00193.c emptyfile http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd/CMakeLists.txt +++ gd/libgd/src/tests/gd/CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd/Makefile.am +++ gd/libgd/src/tests/gd/Makefile.am http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/gd_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd/gd_null.c +++ gd/libgd/src/tests/gd/gd_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/gd2_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gd2/gd2_null.c +++ gd/libgd/src/tests/gd2/gd2_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdnewfilectx/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/src/tests/gdnewfilectx/CMakeLists.txt +++ gd/libgd/src/tests/gdnewfilectx/CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdnewfilectx/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/src/tests/gdnewfilectx/Makefile.am +++ gd/libgd/src/tests/gdnewfilectx/Makefile.am http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdnewfilectx/gdnewfilectx_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gdnewfilectx/gdnewfilectx_null.c +++ gd/libgd/src/tests/gdnewfilectx/gdnewfilectx_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/gif_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/gif/gif_null.c +++ gd/libgd/src/tests/gif/gif_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/jpeg_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/jpeg/jpeg_null.c +++ gd/libgd/src/tests/jpeg/jpeg_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/png_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/png/png_null.c +++ gd/libgd/src/tests/png/png_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/src/tests/wbmp/CMakeLists.txt +++ gd/libgd/src/tests/wbmp/CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/src/tests/wbmp/Makefile.am +++ gd/libgd/src/tests/wbmp/Makefile.am http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/wbmp_null.c?view=markup&rev=1.1 Index: gd/libgd/src/tests/wbmp/wbmp_null.c +++ gd/libgd/src/tests/wbmp/wbmp_null.c