From 51fc3dede23278c6ada6144f27d5041a08349331 Mon Sep 17 00:00:00 2001 From: "Thies C. Arntzen" Date: Sat, 29 Jul 2000 15:29:35 +0000 Subject: [PATCH] @- Fix reading of IPTC via GetImageInfo() for certain JPEG files. (Thies) --- ext/standard/image.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ext/standard/image.c b/ext/standard/image.c index c8b825a0469..6982132df78 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -223,6 +223,7 @@ static void php_read_APP(FILE *fp,unsigned int marker,pval *info) unsigned short length; unsigned char *buffer; unsigned char markername[ 16 ]; + zval *tmp; length = php_read2(fp); length -= 2; /* length includes itself */ @@ -235,7 +236,10 @@ static void php_read_APP(FILE *fp,unsigned int marker,pval *info) sprintf(markername,"APP%d",marker - M_APP0); - add_assoc_stringl(info,markername,buffer,length,1); + if (zend_hash_find(info->value.ht, markername, strlen(markername)+1, (void **) &tmp) == FAILURE) { + /* XXX we onyl catch the 1st tag of it's kind! */ + add_assoc_stringl(info,markername,buffer,length,1); + } efree(buffer); }