Merge branch 'xdebug_3_1'

derickr · Oct 7, 2021 · f754ce9 · f754ce9
2 parents 0f8d0cd + 1fda048
commit f754ce9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/develop/develop.c b/src/develop/develop.c
@@ -119,7 +119,9 @@ static int xdebug_silence_handler(XDEBUG_OPCODE_HANDLER_ARGS)
 	zend_op_array *op_array = &execute_data->func->op_array;
 	const zend_op *cur_opcode = execute_data->opline;
 
-	xdebug_coverage_record_if_active(execute_data, op_array);
+	if (XDEBUG_MODE_IS(XDEBUG_MODE_COVERAGE)) {
+		xdebug_coverage_record_if_active(execute_data, op_array);
+	}
 
 	if (XINI_DEV(do_scream)) {
 		execute_data->opline++;

diff --git a/xdebug.c b/xdebug.c
@@ -404,6 +404,8 @@ static void xdebug_init_base_globals(struct xdebug_base_info *xg)
 
 static void php_xdebug_init_globals(zend_xdebug_globals *xg)
 {
+	memset(&xg->globals, 0, sizeof(xg->globals));
+
 	xdebug_init_library_globals(&xg->globals.library);
 	xdebug_init_base_globals(&xg->base);