archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix unknown opcode overflow error

Browse source
This commit is contained in:
Haitao Lv 2018-02-12 09:25:31 +08:00 • committed by Joe
parent 3253057021
commit 5206f79987
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Zend/zend_vm_gen.php
View file

@ -2396,7 +2396,8 @@ function gen_vm($def, $skel) {
// Insert header
out($f, HEADER_TEXT);
fputs($f,"#include <stdio.h>\n");
fputs($f,"#include <zend.h>\n\n");
fputs($f,"#include <zend.h>\n");
fputs($f,"#include <zend_vm_opcodes.h>\n\n");
fputs($f,"static const char *zend_vm_opcodes_names[".($max_opcode + 1)."] = {\n");
for ($i = 0; $i <= $max_opcode; $i++) {
@ -2411,10 +2412,16 @@ function gen_vm($def, $skel) {
fputs($f, "};\n\n");
fputs($f, "ZEND_API const char* ZEND_FASTCALL zend_get_opcode_name(zend_uchar opcode) {\n");
fputs($f, "\tif (UNEXPECTED(opcode > ZEND_VM_LAST_OPCODE)) {\n");
fputs($f, "\t\treturn NULL;\n");
fputs($f, "\t}\n");
fputs($f, "\treturn zend_vm_opcodes_names[opcode];\n");
fputs($f, "}\n");
fputs($f, "ZEND_API uint32_t ZEND_FASTCALL zend_get_opcode_flags(zend_uchar opcode) {\n");
fputs($f, "\tif (UNEXPECTED(opcode > ZEND_VM_LAST_OPCODE)) {\n");
fputs($f, "\t\topcode = ZEND_NOP;\n");
fputs($f, "\t}\n");
fputs($f, "\treturn zend_vm_opcodes_flags[opcode];\n");
fputs($f, "}\n");

7
Zend/zend_vm_opcodes.c
View file

@ -20,6 +20,7 @@
#include <stdio.h>
#include <zend.h>
#include <zend_vm_opcodes.h>
static const char *zend_vm_opcodes_names[199] = {
"ZEND_NOP",
@ -426,8 +427,14 @@ static uint32_t zend_vm_opcodes_flags[199] = {
};
ZEND_API const char* ZEND_FASTCALL zend_get_opcode_name(zend_uchar opcode) {
if (UNEXPECTED(opcode > ZEND_VM_LAST_OPCODE)) {
return NULL;
}
return zend_vm_opcodes_names[opcode];
}
ZEND_API uint32_t ZEND_FASTCALL zend_get_opcode_flags(zend_uchar opcode) {
if (UNEXPECTED(opcode > ZEND_VM_LAST_OPCODE)) {
opcode = ZEND_NOP;
}
return zend_vm_opcodes_flags[opcode];
}