]> granicus.if.org Git - php/commitdiff
fix exif, thnx laruence
authorkrakjoe <joe.watkins@live.co.uk>
Wed, 7 May 2014 11:03:00 +0000 (12:03 +0100)
committerkrakjoe <joe.watkins@live.co.uk>
Wed, 7 May 2014 11:03:00 +0000 (12:03 +0100)
ext/exif/exif.c

index b0fb69b5f2953e5a542aac61328a7bc1caf49fb2..127cb30941b3c9b46ceb74e2df999a43d112a088 100644 (file)
@@ -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++) {