summaryrefslogtreecommitdiff
path: root/ext/exif/exif.c
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2006-10-10 22:21:36 +0000
committerAntony Dovgal <tony2001@php.net>2006-10-10 22:21:36 +0000
commit93734dd1ca6dc8e013dde0edc33e46351a9ecdff (patch)
treeb8b47ca9735540c1fdf105da7a5e7cc883b76c63 /ext/exif/exif.c
parent6d3e8ce4f888a6a6978e3b21bafff6a76615b618 (diff)
downloadphp-git-93734dd1ca6dc8e013dde0edc33e46351a9ecdff.tar.gz
fix leak and typos in error messages
Diffstat (limited to 'ext/exif/exif.c')
-rw-r--r--ext/exif/exif.c5
1 files changed, 3 insertions, 2 deletions
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;
}