From: Derick Rethans <derick@php.net>
Date: Wed, 10 Apr 2002 06:37:49 +0000 (+0000)
Subject: - Reverse patch
X-Git-Tag: php-4.2.0RC3~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=452e8a06605942042bd1aca9a09a4842d53d3abd;p=php

- Reverse patch
---

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 9a376e93d4..16183ddaa6 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -720,7 +720,6 @@ typedef struct {
 	int  motorola_intel; /* 1 Motorola; 0 Intel */
 
 	char *UserComment;
-	int  UserCommentLength;
 	char UserCommentEncoding[12];
 
 	char *Thumbnail;
@@ -768,7 +767,7 @@ void exif_add_image_info( image_info_type *image_info, int section_index, char *
 
 		case TAG_FMT_STRING:
 			if ( value) {
-				/*length = php_strnlen(value,length); would disable UNICODE comments*/
+				length = php_strnlen(value,length);
 				info_value->length = length;
 				info_value->value.s = estrndup(value,length);
 			} else {
@@ -918,7 +917,7 @@ void exif_free_image_info( image_info_type *image_info, int section_index)
 void add_assoc_image_info( pval *value, int sub_array, image_info_type *image_info, int section_index)
 {
 	char	buffer[64], *val, *name, uname[64];
-	int		idx=0, unknown=0, len;
+	int		idx=0, unknown=0;
 	image_info_value	*info_value;
 
 	if ( image_info->info_list[section_index].count)
@@ -960,16 +959,11 @@ void add_assoc_image_info( pval *value, int sub_array, image_info_type *image_in
 					break;
 
 				case TAG_FMT_STRING:
-					if ( !(val = info_value->value.s)) {
-						val = "";
-						len = 0;
-					} else {
-						len = info_value->length;
-					}
+					if ( !(val = info_value->value.s)) val = "";
 					if (section_index==SECTION_COMMENT) {
-						add_index_stringl(tmpi, idx++, val, len, 1);
+						add_index_string(tmpi, idx++, val, 1);
 					} else {
-						add_assoc_stringl(tmpi, name, val, len , 1);
+						add_assoc_string(tmpi, name, val, 1);
 					}
 					break;
 
@@ -1071,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, php_strnlen(value+2, length-2), value+2);
+    exif_add_image_info( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length-2, value+2);
 }
 /* }}} */
 
@@ -1260,7 +1254,7 @@ static int exif_process_string(char **result,char *value,size_t byte_count) {
  * Process UserComment in IFD. */
 static int exif_process_user_comment(char **pszInfoPtr,char *szEncoding,char *szValuePtr,int ByteCount)
 {
-	int   a, size;
+	int   a;
 
 	*szEncoding = '\0';
 	/* Copy the comment */
@@ -1270,8 +1264,7 @@ static int exif_process_user_comment(char **pszInfoPtr,char *szEncoding,char *sz
 			strcpy( szEncoding, szValuePtr);
 			szValuePtr = szValuePtr+8;
 			ByteCount -= 8;
-			size = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount);
-			return size ? size-1 : 0;
+			return exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount);
 		}
 		if ( !memcmp(szValuePtr, "ASCII\0\0\0", 8)) {
 			strcpy( szEncoding, szValuePtr);
@@ -1290,8 +1283,7 @@ static int exif_process_user_comment(char **pszInfoPtr,char *szEncoding,char *sz
 	if (a) for (a=ByteCount-1;a && szValuePtr[a]==' ';a--) (szValuePtr)[a] = '\0';
 
 	/* normal text without encoding */
-	size = exif_process_string(pszInfoPtr, szValuePtr, ByteCount);
-	return size ? size-1 : 0;
+	return exif_process_string(pszInfoPtr, szValuePtr, ByteCount);
 }
 /* }}} */
 
@@ -1437,7 +1429,7 @@ static void exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, ch
 				break;
 
 			case TAG_USERCOMMENT:
-				ImageInfo->UserCommentLength = exif_process_user_comment(&(ImageInfo->UserComment),ImageInfo->UserCommentEncoding,value_ptr,byte_count);
+				exif_process_user_comment(&(ImageInfo->UserComment),ImageInfo->UserCommentEncoding,value_ptr,byte_count);
 				break;
 
 			/* this is only a comment if type is string! */
@@ -1552,9 +1544,6 @@ static void exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, ch
 	/* correctly would be to set components as length
 	 * but we are ignoring length for those types where it is not the same as byte_count
 	 */
-	if (format==TAG_FMT_STRING) {
-		byte_count = php_strnlen(value_ptr,byte_count);
-	}
 	exif_add_image_info( ImageInfo, section_index, exif_get_tagname(tag,tagname), tag, format, byte_count, value_ptr);
 	if ( outside) efree( outside);
 }
@@ -2277,7 +2266,7 @@ PHP_FUNCTION(exif_read_data)
 		exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "FocusDistance", TAG_NONE, TAG_FMT_STRING, strlen(tmp), tmp);
 	}
 	if (ImageInfo.UserComment) {
-		exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "UserComment", TAG_NONE, TAG_FMT_STRING, ImageInfo.UserCommentLength, ImageInfo.UserComment);
+		exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "UserComment", TAG_NONE, TAG_FMT_STRING, strlen(ImageInfo.UserComment), ImageInfo.UserComment);
 		if ( (len=strlen(ImageInfo.UserCommentEncoding))) {
 			exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "UserCommentEncoding", TAG_NONE, TAG_FMT_STRING, len, ImageInfo.UserCommentEncoding);
 		}