diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 15:14:41 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 15:14:41 +0400 |
| commit | d5831bfa12f6a1863c1b5cf0575986cda99579db (patch) | |
| tree | 68b959a58811ef450b6b4a0871e0437dd2b98513 | |
| parent | 0c6a6f0fba3be20010e36e127f52e58531eee32d (diff) | |
| parent | 1f9ecf42b6e9f89b28318bb01de034f9c3aaef38 (diff) | |
| download | php-git-d5831bfa12f6a1863c1b5cf0575986cda99579db.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
fix exif, thnx laruence
| -rw-r--r-- | ext/exif/exif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index b0fb69b5f2..127cb30941 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++) { |