]> granicus.if.org Git - php/commitdiff
Fixed wrapper errors realted tests
authorXinchen Hui <laruence@gmail.com>
Tue, 4 Mar 2014 10:22:15 +0000 (18:22 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 4 Mar 2014 10:22:15 +0000 (18:22 +0800)
main/streams/streams.c

index cd24a16440a41ffb8dcee6c8d2cbbce7d00b2483..c375b672b9dba400cffc95797a5c3ff68d3c6980 100644 (file)
@@ -159,8 +159,7 @@ static zend_llist *php_get_wrapper_errors_list(php_stream_wrapper *wrapper TSRML
     if (!FG(wrapper_errors)) {
         return NULL;
     } else {
-        return (zend_llist*) zend_hash_str_find_ptr(FG(wrapper_errors), (const char*)&wrapper,
-            sizeof wrapper);
+        return (zend_llist*) zend_hash_str_find_ptr(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper) - 1);
     }
 }
 
@@ -232,7 +231,7 @@ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *
 void php_stream_tidy_wrapper_error_log(php_stream_wrapper *wrapper TSRMLS_DC)
 {
        if (wrapper && FG(wrapper_errors)) {
-               zend_hash_str_del(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper));
+               zend_hash_str_del(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper) - 1);
        }
 }
 
@@ -265,14 +264,14 @@ PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int option
                        ALLOC_HASHTABLE(FG(wrapper_errors));
                        zend_hash_init(FG(wrapper_errors), 8, NULL, wrapper_list_dtor, 0);
                } else {
-                       list = zend_hash_str_find_ptr(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper));
+                       list = zend_hash_str_find_ptr(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper) - 1);
                }
 
                if (!list) {
                        zend_llist new_list;
                        zend_llist_init(&new_list, sizeof(buffer), wrapper_error_dtor, 0);
                        list = zend_hash_str_update_mem(FG(wrapper_errors), (const char*)&wrapper, 
-                                       sizeof(wrapper), &new_list, sizeof(new_list));
+                                       sizeof(wrapper) - 1, &new_list, sizeof(new_list));
                }
 
                /* append to linked list */