com php-src: Fixed IS_RESOURCE handling: Zend/zend_AP I.c Zend/zend_execute.c Zend/zend_operators.c
| From: | Dmitry Stogov | Date: | Mon, 24 Feb 2014 09:12:53 +0000 |
| Subject: | com php-src: Fixed IS_RESOURCE handling: Zend/zend_AP I.c Zend/zend_execute.c Zend/zend_operators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77975@lists.php.net to get a copy of this message | ||
Commit: 844887ed566b264a3654d9cfa90c32c0368a4092
Author: Dmitry Stogov <dmitry@zend.com> Mon, 24 Feb 2014 13:12:53 +0400
Parents: 448e28cc8445826d356dc8cef526a103bd798a9a
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=844887ed566b264a3654d9cfa90c32c0368a4092
Log:
Fixed IS_RESOURCE handling
Changed paths:
M Zend/zend_API.c
M Zend/zend_execute.c
M Zend/zend_operators.c
Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 23a9139..00672c4 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);
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 2c20fb3..8d27453 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1088,8 +1088,9 @@ fetch_string_dim:
hval = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
case IS_RESOURCE:
- zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)",
Z_LVAL_P(dim), Z_LVAL_P(dim));
- /* Fall Through */
+ zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)",
Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
+ hval = Z_RES_HANDLE_P(dim);
+ goto num_index;
case IS_BOOL:
case IS_LONG:
hval = Z_LVAL_P(dim);
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index e81b997..7a66f9f 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -232,10 +232,14 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
break; \
} \
case IS_BOOL: \
- case IS_RESOURCE: \
ZVAL_LONG(&(holder), Z_LVAL_P(op)); \
(op) = &(holder); \
break; \
+ case IS_RESOURCE: \
+ /* ??? delete old resource ??? */ \
+ ZVAL_LONG(&(holder), Z_RES_HANDLE_P(op)); \
+ (op) = &(holder); \
+ break; \
case IS_NULL: \
ZVAL_LONG(&(holder), 0); \
(op) = &(holder); \
@@ -275,9 +279,12 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
convert_to_long_base(&(holder), 10); \
break; \
case IS_BOOL: \
- case IS_RESOURCE: \
Z_LVAL(holder) = Z_LVAL_P(op); \
break; \
+ case IS_RESOURCE: \
+ /* ??? delete old resource ??? */ \
+ ZVAL_LONG(&holder, Z_RES_HANDLE_P(op)); \
+ break; \
default: \
zend_error(E_WARNING, "Cannot convert to ordinal value"); \
Z_LVAL(holder) = 0; \
@@ -299,6 +306,8 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
Z_LVAL(holder) = 0; \
break; \
case IS_RESOURCE: \
+ Z_LVAL(holder) = (Z_RES_HANDLE_P(op) ? 1 : 0); \
+ break; \
case IS_LONG: \
Z_LVAL(holder) = (Z_LVAL_P(op) ? 1 : 0); \
break; \
@@ -1728,9 +1737,11 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2
TSRMLS_DC)
break;
case IS_BOOL:
case IS_LONG:
- case IS_RESOURCE:
Z_LVAL_P(result) = (Z_LVAL_P(op1) == Z_LVAL_P(op2));
break;
+ case IS_RESOURCE:
+ Z_LVAL_P(result) = (Z_RES_P(op1) == Z_RES_P(op2));
+ break;
case IS_DOUBLE:
Z_LVAL_P(result) = (Z_DVAL_P(op1) == Z_DVAL_P(op2));
break;