summaryrefslogtreecommitdiff
path: root/Zend/zend_list.c
diff options
context:
space:
mode:
authorAndrei Zmievski <andrei@php.net>2000-10-20 18:26:15 +0000
committerAndrei Zmievski <andrei@php.net>2000-10-20 18:26:15 +0000
commitdadb140e2f38a02332179285aaa636c48b2bca12 (patch)
tree47ed43618933685da7eb42d4edcc672ae4084189 /Zend/zend_list.c
parent7b4983c8f82c4f361df787f58c6f5cf88d5def0b (diff)
downloadphp-git-dadb140e2f38a02332179285aaa636c48b2bca12.tar.gz
- Fixed a bug in zend_rsrc_list_get_rsrc_type()
- Switched register_list_destructors() to use zend_register_list_destructors_ex() instead
Diffstat (limited to 'Zend/zend_list.c')
-rw-r--r--Zend/zend_list.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 9b16e8c0a1..7fb20c85cb 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -397,8 +397,12 @@ void zend_destroy_rsrc_list_dtors()
char *zend_rsrc_list_get_rsrc_type(int resource)
{
zend_rsrc_list_dtors_entry *lde;
+ int rsrc_type;
- if (zend_hash_index_find(&list_destructors, resource, (void **) &lde)==SUCCESS) {
+ if (!zend_list_find(resource, &rsrc_type))
+ return NULL;
+
+ if (zend_hash_index_find(&list_destructors, rsrc_type, (void **) &lde)==SUCCESS) {
return lde->type_name;
} else {
return NULL;