summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2002-03-16 20:02:12 +0000
committerMarcus Boerger <helly@php.net>2002-03-16 20:02:12 +0000
commitc998e8137eab79088972ffc20f649bf00a343062 (patch)
treedef322329770085343aa718637188f08e2d5a099
parentc104474c3cae4a01889e364e40ab86df63ddc232 (diff)
downloadphp-git-c998e8137eab79088972ffc20f649bf00a343062.tar.gz
-fix bug with not correctly terminated comments
-rw-r--r--ext/exif/exif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 78a5b5821a..a0d95a9dd4 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1065,7 +1065,7 @@ void add_assoc_image_info( pval *value, int sub_array, image_info_type *image_in
*/
static void exif_process_COM (image_info_type *image_info, uchar *value, int length)
{
- exif_add_image_info( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length, value);
+ exif_add_image_info( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length-2, value+2);
}
/* }}} */
@@ -1788,7 +1788,7 @@ static int exif_scan_JPEG_header(image_info_type *ImageInfo, FILE *infile)
return (ImageInfo->sections_found&(~FOUND_COMPUTED)) ? TRUE : FALSE;
case M_COM: /* Comment section */
- exif_process_COM(ImageInfo, (char *)Data+2, itemlen);
+ exif_process_COM(ImageInfo, (char *)Data, itemlen);
break;
case M_EXIF: