From: Xinchen Hui Date: Fri, 28 Feb 2014 14:52:18 +0000 (+0800) Subject: Fixed offset_key X-Git-Tag: POST_PHPNG_MERGE~412^2~476 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4340f1a561d8b549f6d59a8cf99485107cd5ae1f;p=php Fixed offset_key --- diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 4933c4f753..8c8a8194ac 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -320,17 +320,17 @@ fetch_dim_string: if ((retval = (zend_symtable_find(ht, offset_key))) == NULL) { switch (type) { case BP_VAR_R: - zend_error(E_NOTICE, "Undefined index: %s", Z_STRVAL_P(offset)); + zend_error(E_NOTICE, "Undefined index: %s", offset_key->val); case BP_VAR_UNSET: case BP_VAR_IS: retval = &EG(uninitialized_zval); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset)); + zend_error(E_NOTICE,"Undefined index: %s", offset_key->val); case BP_VAR_W: { zval value; ZVAL_UNDEF(&value); - retval = zend_symtable_update(ht, Z_STR_P(offset), &value); + retval = zend_symtable_update(ht, offset_key, &value); } } }