com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: Zend/zend_API.c Zend/ze nd_compile.c Zend/zend_vm_def.h
Zend/zend_vm_ execute.h ext/exif/exif.c ext/opcache/Optimizer/pass1 _5.c ext/pdo_odbc/odbc_stmt.c ext/soap/soap.c

Commit: 3e901323413b18e46f075027053023d7cdfeb7bf Author: Anatol Belski <ab@php.net> Tue, 17 Dec 2013 09:01:11 +0100 Parents: a56274b3f11ffd3df14f537aad7465d46bf83c2c c0f1e6946dd924359078a8e6be8a8ad8180c10ec Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e901323413b18e46f075027053023d7cdfeb7bf Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: Zend/zend_compile.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/opcache/Optimizer/pass1_5.c ext/pdo_odbc/odbc_stmt.c Changed paths: MM Zend/zend_API.c MM Zend/zend_compile.c MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/exif/exif.c MM ext/opcache/Optimizer/pass1_5.c MM ext/pdo_odbc/odbc_stmt.c MM ext/soap/soap.c Diff: diff --cc Zend/zend_compile.c index 9164d4b,c61f3a2..281ce63 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@@ -664,10 -664,10 +664,10 @@@ void fetch_simple_variable_ex(znode *re convert_to_string(&varname->u.constant); } - hash = str_hash(Z_STRVAL(varname->u.constant), Z_STRLEN(varname->u.constant)); - if (!zend_is_auto_global_quick(Z_STRVAL(varname->u.constant), Z_STRLEN(varname->u.constant), hash TSRMLS_CC) && + hash = str_hash(Z_STRVAL(varname->u.constant), Z_STRSIZE(varname->u.constant)); + if (!zend_is_auto_global_quick(Z_STRVAL(varname->u.constant), Z_STRSIZE(varname->u.constant), hash TSRMLS_CC) && - !(Z_STRSIZE(varname->u.constant) == (sizeof("this")-1) && - !memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this"))) && + !(Z_STRLEN(varname->u.constant) == (sizeof("this")-1) && + !memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this") - 1)) && (CG(active_op_array)->last == 0 || CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode != ZEND_BEGIN_SILENCE)) { result->op_type = IS_CV; @@@ -911,8 -911,8 +911,8 @@@ static zend_bool opline_is_fetch_this(c && (Z_TYPE(CONSTANT(opline->op1.constant)) == IS_STRING) && ((opline->extended_value & ZEND_FETCH_STATIC_MEMBER) != ZEND_FETCH_STATIC_MEMBER) && (Z_HASH_P(&CONSTANT(opline->op1.constant)) == THIS_HASHVAL) - && (Z_STRLEN(CONSTANT(opline->op1.constant)) == (sizeof("this")-1)) + && (Z_STRSIZE(CONSTANT(opline->op1.constant)) == (sizeof("this")-1)) - && !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this"))) { + && !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this") - 1)) { return 1; } else { return 0; diff --cc Zend/zend_vm_def.h index c6d5951,7cf85d5..6dcec81 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@@ -3583,7 -3583,7 +3583,7 @@@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT } ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value); zval_copy_ctor(&EX_T(opline->result.var).tmp_var); - } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) { - } else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) { ++ } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) { /* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */ ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1); } else { diff --cc Zend/zend_vm_execute.h index 3e5c86e,43a0d18..c5e095a --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@@ -3817,7 -3817,7 +3817,7 @@@ static int ZEND_FASTCALL ZEND_FETCH_CO } ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value); zval_copy_ctor(&EX_T(opline->result.var).tmp_var); - } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) { - } else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) { ++ } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) { /* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */ ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1); } else { @@@ -15625,7 -15625,7 +15625,11 @@@ static int ZEND_FASTCALL ZEND_FETCH_CO } ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value); zval_copy_ctor(&EX_T(opline->result.var).tmp_var); ++<<<<<<< HEAD + } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) { ++======= + } else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) { ++>>>>>>> origin/master /* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */ ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1); } else { @@@ -25141,7 -25141,7 +25145,11 @@@ static int ZEND_FASTCALL ZEND_FETCH_CO } ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value); zval_copy_ctor(&EX_T(opline->result.var).tmp_var); ++<<<<<<< HEAD + } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) { ++======= + } else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) { ++>>>>>>> origin/master /* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */ ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1); } else { diff --cc ext/opcache/Optimizer/pass1_5.c index 34a22e3,4601562..f6d3ea9 --- a/ext/opcache/Optimizer/pass1_5.c +++ b/ext/opcache/Optimizer/pass1_5.c @@@ -513,8 -513,8 +513,8 @@@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATIO opline->op1_type == IS_CONST && opline->op2_type == IS_UNUSED && Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING && - (Z_STRLEN(ZEND_OP1_LITERAL(opline)) != sizeof("this")-1 || + (Z_STRSIZE(ZEND_OP1_LITERAL(opline)) != sizeof("this")-1 || - memcmp(Z_STRVAL(ZEND_OP1_LITERAL(opline)), "this", sizeof("this")) != 0)) { + memcmp(Z_STRVAL(ZEND_OP1_LITERAL(opline)), "this", sizeof("this") - 1) != 0)) { int var = opline->result.var; int level = 0; diff --cc ext/pdo_odbc/odbc_stmt.c index 281f43a,89b6721..81158ab3 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@@ -471,9 -470,9 +471,9 @@@ static int odbc_stmt_param_hook(pdo_stm P = param->driver_data; if (P->outbuf) { if (P->outbuf) { - unsigned long ulen; + php_uint_t ulen; char *srcbuf; - php_uint_t srclen; - unsigned long srclen = 0; ++ php_uint_t srclen = 0; switch (P->len) { case SQL_NULL_DATA: