From: Marcus Boerger <helly@php.net>
Date: Sat, 16 Mar 2002 20:02:12 +0000 (+0000)
Subject: -fix bug with not correctly terminated comments
X-Git-Tag: php-4.2.0RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c998e8137eab79088972ffc20f649bf00a343062;p=php

-fix bug with not correctly terminated comments
---

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: