Automatically add entropy from user opcode handlers

Author: SammyK

Zend/zend_execute.c

@@ -40,7 +40,6 @@
 #include "zend_inheritance.h"
 #include "zend_type_info.h"
 #include "zend_smart_str.h"
-#include "zend_system_id.h"
 
 /* Virtual current working directory support */
 #include "zend_virtual_cwd.h"
@@ -4751,7 +4750,7 @@ static zend_always_inline zend_execute_data *_zend_vm_stack_push_call_frame(uint
 
 #include "zend_vm_execute.h"
 
-ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler, const char *module_name)
+ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler)
 {
 	if (opcode != ZEND_USER_OPCODE) {
 		if (handler == NULL) {
@@ -4761,7 +4760,6 @@ ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler
 			zend_user_opcodes[opcode] = ZEND_USER_OPCODE;
 		}
 		zend_user_opcode_handlers[opcode] = handler;
-		zend_add_system_entropy(module_name, "zend_set_user_opcode_handler", &opcode, sizeof(zend_uchar));
 		return SUCCESS;
 	}
 	return FAILURE;

Zend/zend_execute.h

@@ -339,7 +339,7 @@ ZEND_API zval* zend_get_compiled_variable_value(const zend_execute_data *execute
 
 #define ZEND_USER_OPCODE_DISPATCH_TO 0x100 /* call original handler of returned opcode */
 
-ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler, const char *module_name);
+ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler);
 ZEND_API user_opcode_handler_t zend_get_user_opcode_handler(zend_uchar opcode);
 
 ZEND_API zval *zend_get_zval_ptr(const zend_op *opline, int op_type, const znode_op *node, const zend_execute_data *execute_data);

Zend/zend_system_id.c

@@ -63,7 +63,8 @@ void zend_startup_system_id(void)
 void zend_finalize_system_id(void)
 {
 	unsigned char digest[16];
-	zend_long hooks = 0;
+	zend_uchar hooks = 0;
+	int16_t i = 0;
 
 	if (zend_ast_process) {
 		hooks |= ZEND_HOOK_AST_PROCESS;
@@ -77,7 +78,13 @@ void zend_finalize_system_id(void)
 	if (zend_execute_internal) {
 		hooks |= ZEND_HOOK_EXECUTE_INTERNAL;
 	}
-	PHP_MD5Update(&context, &hooks, sizeof(zend_long));
+	PHP_MD5Update(&context, &hooks, sizeof(zend_uchar));
+
+	for (; i < 256; i++) {
+		if (zend_get_user_opcode_handler((zend_uchar) i) != NULL) {
+			PHP_MD5Update(&context, &i, sizeof(int16_t));
+		}
+	}
 
 	PHP_MD5Final(digest, &context);
 	php_hash_bin2hex(zend_system_id, digest, sizeof digest);