Misc test case fixes and memory issues.

Already part of Xdebug proper too, but needed it in here to be able to proceed.
xdebug · Oct 25, 2014 · a78f522 · a78f522
1 parent 07b3ac4
commit a78f522
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/tests/bug00538-2.phpt b/tests/bug00538-2.phpt
@@ -48,7 +48,7 @@ array(2) {
     ["params"]=>
     array(3) {
       ["param1"]=>
-      string(%d) "'%sxdebug'"
+      string(%d) "'%s'"
       ["param2"]=>
       string(16) "'candena\\a\\nb'"
       ["param3"]=>

diff --git a/xdebug.c b/xdebug.c
@@ -1624,7 +1624,7 @@ void xdebug_execute_internal(zend_execute_data *current_execute_data, struct _ze
 	}
 
 	/* Store return value in the trace file */
-	if (XG(collect_return) && do_return && XG(do_trace) && XG(trace_context) && EG(opline_ptr)) {
+	if (XG(collect_return) && do_return && XG(do_trace) && XG(trace_context) && EG(opline_ptr) && current_execute_data->opline) {
 		cur_opcode = *EG(opline_ptr);
 		if (cur_opcode) {
 			zval *ret = xdebug_zval_ptr(cur_opcode->XDEBUG_TYPE(result), &(cur_opcode->result), current_execute_data TSRMLS_CC);

diff --git a/xdebug_compat.c b/xdebug_compat.c
@@ -75,6 +75,7 @@ zval *xdebug_zval_ptr(int op_type, XDEBUG_ZNODE *node, zend_execute_data *zdata
 	if (!zdata->opline) {
 		return NULL;
 	}
+
 	switch (op_type & 0x0F) {
 		case IS_CONST:
 #if PHP_VERSION_ID >= 50399