tony2001 Tue Oct 10 22:21:37 2006 UTC Modified files: /php-src/ext/exif exif.c Log: fix leak and typos in error messages http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.183&r2=1.184&diff_format=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.183 php-src/ext/exif/exif.c:1.184 --- php-src/ext/exif/exif.c:1.183 Thu Aug 17 14:32:27 2006 +++ php-src/ext/exif/exif.c Tue Oct 10 22:21:36 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.183 2006/08/17 14:32:27 tony2001 Exp $ */ +/* $Id: exif.c,v 1.184 2006/10/10 22:21:36 tony2001 Exp $ */ /* ToDos * @@ -139,7 +139,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.183 2006/08/17 14:32:27 tony2001 Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.184 2006/10/10 22:21:36 tony2001 Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -2161,7 +2161,7 @@ } } else { exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, 0, NULL); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "JPEG2000 comment section to small"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "JPEG2000 comment section too small"); } } #endif @@ -3687,7 +3687,7 @@ } } } else { - exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "File to small (%d)", ImageInfo->FileSize); + exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "File too small (%d)", ImageInfo->FileSize); } return ret; } @@ -4001,6 +4001,7 @@ ret = exif_read_file(&ImageInfo, p_name, 1, 0 TSRMLS_CC); if (ret==FALSE) { + exif_discard_imageinfo(&ImageInfo); RETURN_FALSE; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php