Reset overloaded opcodes at the end of each request

xdebug · Jun 4, 2015 · c50a75d · c50a75d
1 parent 8a4d946
commit c50a75d
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/xdebug.c b/xdebug.c
@@ -776,7 +776,17 @@ PHP_MSHUTDOWN_FUNCTION(xdebug)
 #else
 	php_xdebug_shutdown_globals(&xdebug_globals TSRMLS_CC);
 #endif
+
+	/* cleanup handlers set in MINIT to xdebug_check_branch_entry_handler */
+	{
+		int i;
 
+		for (i = 0; i < 256; i++) {
+			if (zend_get_user_opcode_handler(i) == xdebug_check_branch_entry_handler) {
+				zend_set_user_opcode_handler(i, NULL);
+			}
+		}
+	}
 	return SUCCESS;
 }