com php-src: Merge branch 'master' into str_size_and_int 64: Zend/zend_builtin_functions.c Zend/zend_e xecute.c Zend/zend_execute.h Zend/zend_vm_def.h
Zend/zend_vm_execute.h ext/standard/array.c ext/ standard/basic_functions.c ext/standard/crypt.c ext/s tandard/php_array.h ext/standard/var.c

From: Date: Mon, 04 Nov 2013 08:19:52 +0000
Subject: com php-src: Merge branch 'master' into str_size_and_int 64: Zend/zend_builtin_functions.c Zend/zend_e xecute.c Zend/zend_execute.h Zend/zend_vm_def.h
Zend/zend_vm_execute.h ext/standard/array.c ext/ standard/basic_functions.c ext/standard/crypt.c ext/s tandard/php_array.h ext/standard/var.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73848@lists.php.net to get a copy of this message
Commit: e243a26b4c0089eea2bce5577dfed80c01f335b9 Author: Anatol Belski <ab@php.net> Mon, 4 Nov 2013 09:19:52 +0100 Parents: 1ba7ceee178d1041a2c3764ce9db3e36a6fe40e8 2f555b8e606b5f09d635cef4d3fcbcd6939adae2 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e243a26b4c0089eea2bce5577dfed80c01f335b9 Log: Merge branch 'master' into str_size_and_int64 * master: (30 commits) Fixed coredump due to abnormal implemention of phar Fix English here Fix bug #66008 Removed unnecessary GC checks Add crypt() change in UPGRADING Fix bug #65997 by switching to Serializable for GMP Fix compile warning in GMP Fix ZTS build updated libs_versions.txt Implemented Change crypt() behavior w/o salt RFC Update NEWS Update NEWS Fixed Bug 64760 var_export() does not use full precision for floating-point numbers add bundled libzip LICENSE, as required by BSD License terms Avoid copy in func_get_arg() - Updated to version 2013.8 (2013h) Use zval* instead of zval** Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris) Improved performance of array_merge() by eliminating useless copying Improved performance of func_get_args() by eliminating useless copying ... Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h Bugs: https://bugs.php.net/66008 https://bugs.php.net/65997 https://bugs.php.net/64760 Changed paths: MM Zend/zend_builtin_functions.c MM Zend/zend_execute.c MM Zend/zend_execute.h MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/standard/array.c MM ext/standard/basic_functions.c MM ext/standard/crypt.c MM ext/standard/php_array..h MM ext/standard/var.c

diff --cc Zend/zend_vm_def.h index cdc3ddc,572aac5..ca3c480 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@@ -4526,12 -4525,10 +4525,10 @@@ ZEND_VM_C_LABEL(num_index_prop) if (OP2_TYPE == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index_prop)); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index_prop)); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index_prop)); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -4601,11 -4598,11 +4598,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } diff --cc Zend/zend_vm_execute.h index c95bb73,7ad7dcf..e3ed05f --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@@ -14649,8 -14649,8 +14649,8 @@@ static int ZEND_FASTCALL zend_fetch_var } else { ce = EX_T(opline->op2.var).class_entry; } - retval = zend_std_get_static_property(ce, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0, ((IS_VAR == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC); + retval = zend_std_get_static_property(ce, Z_STRVAL_P(varname), Z_STRSIZE_P(varname), 0, ((IS_VAR == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC); - zval_ptr_dtor(&free_op1.var); + zval_ptr_dtor_nogc(&free_op1.var); } else { target_symbol_table = zend_get_target_symbol_table(opline->extended_value & ZEND_FETCH_TYPE_MASK TSRMLS_CC); /* @@@ -16095,12 -16094,10 +16094,10 @@@ num_index_prop if (IS_CONST == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -16170,11 -16167,11 +16167,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -18172,12 -18168,10 +18168,10 @@@ num_index_prop if (IS_TMP_VAR == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -18247,11 -18241,11 +18241,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -19222,8 -19216,8 +19216,8 @@@ static int ZEND_FASTCALL zend_fetch_var } else { ce = EX_T(opline->op2.var).class_entry; } - retval = zend_std_get_static_property(ce, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0, ((IS_VAR == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC); + retval = zend_std_get_static_property(ce, Z_STRVAL_P(varname), Z_STRSIZE_P(varname), 0, ((IS_VAR == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC); - zval_ptr_dtor(&free_op1.var); + zval_ptr_dtor_nogc(&free_op1.var); } else { target_symbol_table = zend_get_target_symbol_table(opline->extended_value & ZEND_FETCH_TYPE_MASK TSRMLS_CC); /* @@@ -20629,12 -20622,10 +20622,10 @@@ num_index_prop if (IS_VAR == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -20704,11 -20695,11 +20695,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -21197,8 -21188,8 +21188,8 @@@ static int ZEND_FASTCALL zend_fetch_var } else { ce = EX_T(opline->op2.var).class_entry; } - retval = zend_std_get_static_property(ce, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0, ((IS_VAR == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC); + retval = zend_std_get_static_property(ce, Z_STRVAL_P(varname), Z_STRSIZE_P(varname), 0, ((IS_VAR == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC); - zval_ptr_dtor(&free_op1.var); + zval_ptr_dtor_nogc(&free_op1.var); } else { target_symbol_table = zend_get_target_symbol_table(opline->extended_value & ZEND_FETCH_TYPE_MASK TSRMLS_CC); /* @@@ -23900,12 -23890,10 +23890,10 @@@ num_index_prop if (IS_CV == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -23975,11 -23963,11 +23963,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -25397,12 -25384,10 +25384,10 @@@ num_index_prop if (IS_CONST == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -25472,11 -25457,11 +25457,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -26707,12 -26691,10 +26691,10 @@@ num_index_prop if (IS_TMP_VAR == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -26782,11 -26764,11 +26764,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -28017,12 -27998,10 +27998,10 @@@ num_index_prop if (IS_VAR == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -28092,11 -28071,11 +28071,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -29749,12 -29727,10 +29727,10 @@@ num_index_prop if (IS_CV == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -29824,11 -29800,11 +29800,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -33246,12 -33221,10 +33221,10 @@@ num_index_prop if (IS_CONST == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -33321,11 -33294,11 +33294,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -35186,12 -35158,10 +35158,10 @@@ num_index_prop if (IS_TMP_VAR == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -35261,11 -35231,11 +35231,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -37505,12 -37474,10 +37474,10 @@@ num_index_prop if (IS_VAR == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -37580,11 -37547,11 +37547,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } @@@ -40491,12 -40457,10 +40457,10 @@@ num_index_prop if (IS_CV == IS_CONST) { hval = Z_HASH_P(offset); } else { - if (!prop_dim) { - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); - } - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, goto num_index_prop); - hval = str_hash(Z_STRVAL_P(offset), Z_STRLEN_P(offset)); ++ ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, goto num_index_prop); + hval = str_hash(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)); } - if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, (void **) &value) == SUCCESS) { + if (zend_hash_quick_find(ht, Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, hval, (void **) &value) == SUCCESS) { isset = 1; } break; @@@ -40566,11 -40530,11 +40530,11 @@@ } if (Z_TYPE_P(offset) == IS_LONG) { if (opline->extended_value & ZEND_ISSET) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container)) { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container)) { result = 1; } } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { - if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { ++ if (offset->value.lval >= 0 && offset->value.lval < Z_STRSIZE_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') { result = 1; } } diff --cc ext/standard/var.c index 608e93d,a7ece7f..e39b1de --- a/ext/standard/var.c +++ b/ext/standard/var.c @@@ -433,10 -433,10 +433,10 @@@ PHPAPI void php_var_export_ex(zval **st smart_str_appendl(buf, "NULL", 4); break; case IS_LONG: - smart_str_append_long(buf, Z_LVAL_PP(struc)); + smart_str_append_php_int(buf, Z_LVAL_PP(struc)); break; case IS_DOUBLE: - tmp_len = spprintf(&tmp_str, 0,"%.*H", (int) EG(precision), Z_DVAL_PP(struc)); + tmp_len = spprintf(&tmp_str, 0,"%.*H", PG(serialize_precision), Z_DVAL_PP(struc)); smart_str_appendl(buf, tmp_str, tmp_len); efree(tmp_str); break;
« previous php.cvs (#73848) next »