]> granicus.if.org Git - php/commitdiff
Use memcmp here is better
authorXinchen Hui <laruence@php.net>
Tue, 17 Dec 2013 07:37:10 +0000 (15:37 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 17 Dec 2013 07:37:10 +0000 (15:37 +0800)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 5385f3eec99c82e5de99f03510381ada09cf7914..7cf85d51b63ccbb0e5e7c77f7ca7e4065ba3fe7b 100644 (file)
@@ -3583,7 +3583,7 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
                        }
                        ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
                        zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
-               } else if (Z_STRLEN_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) {
                        /* "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 {
index 02f8acb6beb154a6371cf6f639f5a71ac1223198..43a0d184c7241c18b90c3cce12363f38317b39be 100644 (file)
@@ -3817,7 +3817,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
                        }
                        ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
                        zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
-               } else if (Z_STRLEN_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) {
                        /* "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 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
                        }
                        ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
                        zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
-               } else if (Z_STRLEN_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) {
                        /* "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 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
                        }
                        ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
                        zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
-               } else if (Z_STRLEN_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) {
                        /* "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 {