@- Fix reading of IPTC via GetImageInfo() for certain JPEG files. (Thies)

diff --git a/ext/standard/image.c b/ext/standard/image.c
index c8b825a04699cadb3b01debb0bb420f399335982..6982132df788b363ef5ad62deb3f6daabbcf38f8 100644 (file)
--- 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);
 }