Browse Source

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

PHP-4.0.5
Thies C. Arntzen 26 years ago
parent
commit
51fc3dede2
  1. 6
      ext/standard/image.c

6
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);
}

Loading…
Cancel
Save