Skip to content

Commit b331a21

Browse files
committed
Use memcmp here is better
1 parent eeb37c4 commit b331a21

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3583,7 +3583,7 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
35833583
}
35843584
ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
35853585
zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
3586-
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) {
3586+
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
35873587
/* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */
35883588
ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1);
35893589
} else {

Zend/zend_vm_execute.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3817,7 +3817,7 @@ static int ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
38173817
}
38183818
ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
38193819
zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
3820-
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) {
3820+
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
38213821
/* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */
38223822
ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1);
38233823
} else {
@@ -15625,7 +15625,7 @@ static int ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
1562515625
}
1562615626
ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
1562715627
zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
15628-
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) {
15628+
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
1562915629
/* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */
1563015630
ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1);
1563115631
} else {
@@ -25141,7 +25141,7 @@ static int ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
2514125141
}
2514225142
ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
2514325143
zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
25144-
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) {
25144+
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
2514525145
/* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */
2514625146
ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1);
2514725147
} else {

0 commit comments

Comments
 (0)