summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-02-24 13:12:53 +0400
committerDmitry Stogov <dmitry@zend.com>2014-02-24 13:12:53 +0400
commit844887ed566b264a3654d9cfa90c32c0368a4092 (patch)
tree07bb367c57152f0458b81aa372fbbcbc091f0e5b /Zend/zend_API.c
parent448e28cc8445826d356dc8cef526a103bd798a9a (diff)
downloadphp-git-844887ed566b264a3654d9cfa90c32c0368a4092.tar.gz
Fixed IS_RESOURCE handling
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 23a9139c8e..00672c4564 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1619,8 +1619,9 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value) /* {{{ */
result = zend_symtable_update(ht, STR_EMPTY_ALLOC(), value);
break;
case IS_RESOURCE:
- zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(key), Z_LVAL_P(key));
- /* break missing intentionally */
+ zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key));
+ result = zend_hash_index_update(ht, Z_RES_HANDLE_P(key), value);
+ break;
case IS_BOOL:
case IS_LONG:
result = zend_hash_index_update(ht, Z_LVAL_P(key), value);