cvs: php4(PHP_4_2_0) /ext/exif exif.c
| From: | Marcus B�rger | Date: | Sat, 16 Mar 2002 20:02:13 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/exif exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10261@lists.php.net to get a copy of this message | ||
helly Sat Mar 16 15:02:13 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/exif exif.c
Log:
-fix bug with not correctly terminated comments
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.52.2.1 php4/ext/exif/exif.c:1.52.2.2
--- php4/ext/exif/exif.c:1.52.2.1 Mon Mar 11 14:04:28 2002
+++ php4/ext/exif/exif.c Sat Mar 16 15:02:12 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.52.2.1 2002/03/11 19:04:28 helly Exp $ */
+/* $Id: exif.c,v 1.52.2.2 2002/03/16 20:02:12 helly Exp $ */
/* ToDos
*
@@ -1065,7 +1065,7 @@
*/
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 @@
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: