com php-src: fix exif, thnx laruence: ext/exif/exif.c
| From: | Joe Watkins | Date: | Wed, 07 May 2014 11:03:00 +0000 |
| Subject: | com php-src: fix exif, thnx laruence: ext/exif/exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78176@lists.php.net to get a copy of this message | ||
Commit: 6cab75aaa4a5968d709458068327017f94b72f4b
Author: krakjoe <joe.watkins@live.co.uk> Wed, 7 May 2014 12:03:00 +0100
Parents: 0a134d1a3afd64134b09de6b575ab750395f3538
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6cab75aaa4a5968d709458068327017f94b72f4b
Log:
fix exif, thnx laruence
Changed paths:
M ext/exif/exif.c
Diff:
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index b0fb69b..127cb30 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -222,7 +222,7 @@ static PHP_GINIT_FUNCTION(exif)
PHP_MINIT_FUNCTION(exif)
{
REGISTER_INI_ENTRIES();
- if (zend_hash_str_exists(&module_registry, "mbstring",
sizeof("mbstring"))) {
+ if (zend_hash_str_exists(&module_registry, "mbstring",
sizeof("mbstring")-1)) {
REGISTER_LONG_CONSTANT("EXIF_USE_MBSTRING", 1, CONST_CS | CONST_PERSISTENT);
} else {
REGISTER_LONG_CONSTANT("EXIF_USE_MBSTRING", 0, CONST_CS | CONST_PERSISTENT);
@@ -1950,7 +1950,7 @@ static void add_assoc_image_info(zval *value, int sub_array, image_info_type
*im
if (sub_array) {
array_init(&tmpi);
} else {
- tmpi = *value;
+ ZVAL_COPY_VALUE(&tmpi, value);
}
for(i=0; i<image_info->info_list[section_index].count; i++) {