From: Antony Dovgal Date: Tue, 10 Oct 2006 22:21:36 +0000 (+0000) Subject: fix leak and typos in error messages X-Git-Tag: RELEASE_1_0_0RC1~1324 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93734dd1ca6dc8e013dde0edc33e46351a9ecdff;p=php fix leak and typos in error messages --- diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 2328563ce9..0152b29b2f 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2161,7 +2161,7 @@ static void exif_process_CME (image_info_type *image_info, char *value, size_t l } } 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 @@ static int exif_scan_FILE_header(image_info_type *ImageInfo TSRMLS_DC) } } } 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 @@ PHP_FUNCTION(exif_thumbnail) ret = exif_read_file(&ImageInfo, p_name, 1, 0 TSRMLS_CC); if (ret==FALSE) { + exif_discard_imageinfo(&ImageInfo); RETURN_FALSE; }