[xdebug-dev] xdebug xdebug/xdebug.c xdebug/tests/assert_test.phpt xdebug/tests/call_user_func_array.phpt xdebug/tests/call_user_func_array2.phpt - Fixed bug #142: xdebug crashes with implicit destructor calls.

Date: Fri Sep 23 10:22:57 CEST 2005
User: Derick Rethans
Directory: xdebug

Log Message:
[1.00]
- Fixed bug #142: xdebug crashes with implicit destructor calls.

Modified files:
           xdebug/xdebug.c (version: 1.276)
           xdebug/tests/assert_test.phpt (version: 1.12)
           xdebug/tests/call_user_func_array.phpt (version: 1.10)
           xdebug/tests/call_user_func_array2.phpt (version: 1.10)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- xdebug/xdebug.c:1.275 Thu Sep 22 16:36:51 2005 GMT
+++ xdebug/xdebug.c Fri Sep 23 06:22:56 2005 GMT
@@ -946,8 +946,8 @@
                 }
 #endif
         } else {
- if (EG(opline_ptr)) {
- cur_opcode = *EG(opline_ptr);
+ if (EG(current_execute_data)->opline) {
+ cur_opcode = EG(current_execute_data)->opline;
                         if (cur_opcode) {
                                 tmp->lineno = cur_opcode->lineno;
                         }

[FILE: /xdebug/tests/assert_test.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xdebug/tests/assert_test.phpt:1.11 Mon Aug 16 05:59:56 2004 GMT
+++ xdebug/tests/assert_test.phpt Fri Sep 23 06:22:57 2005 GMT
@@ -46,5 +46,5 @@
     %f %d -> assert_options(5, 1) /%s/assert_test.php:7
     %f %d -> assert_options(2, 'my_assert_handler') /%s/assert_test.php:18
     %f %d -> assert(FALSE) /%s/assert_test.php:21
- %f %d -> my_assert_handler('/%s/assert_test.php', 21, '') /%s/assert_test.php:21
+ %f %d -> my_assert_handler('/%s/assert_test.php', 21, '') /%s/assert_test.php:0
     %f %d -> file_get_contents('/tmp/%s') /%s/assert_test.php:23

[FILE: /xdebug/tests/call_user_func_array.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/tests/call_user_func_array.phpt:1.9 Mon Aug 16 05:59:56 2004 GMT
+++ xdebug/tests/call_user_func_array.phpt Fri Sep 23 06:22:57 2005 GMT
@@ -33,10 +33,10 @@
 --EXPECTF--
 TRACE START [%d-%d-%d %d:%d:%d]
     %f %d -> call_user_func_array('debug', array (0 => 'foo', 1 => array (0 => 1, 1 => 2))) /%s/call_user_func_array.php:13
- %f %d -> debug('foo', array (0 => 1, 1 => 2)) /%s/call_user_func_array.php:13
+ %f %d -> debug('foo', array (0 => 1, 1 => 2)) /%s/call_user_func_array.php:0
     %f %d -> is_array(array (0 => 1, 1 => 2)) /%s/call_user_func_array.php:5
     %f %d -> call_user_func_array('debug', array (0 => 'bar', 1 => 'bar')) /%s/call_user_func_array.php:16
- %f %d -> debug('bar', 'bar') /%s/call_user_func_array.php:16
+ %f %d -> debug('bar', 'bar') /%s/call_user_func_array.php:0
     %f %d -> is_array('bar') /%s/call_user_func_array.php:5
     %f %d -> is_object('bar') /%s/call_user_func_array.php:5
     %f %d -> is_resource('bar') /%s/call_user_func_array.php:5

[FILE: /xdebug/tests/call_user_func_array2.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/tests/call_user_func_array2.phpt:1.9 Mon Aug 16 05:59:56 2004 GMT
+++ xdebug/tests/call_user_func_array2.phpt Fri Sep 23 06:22:57 2005 GMT
@@ -28,10 +28,10 @@
 TRACE START [%d-%d-%d %d:%d:%d]
     %f %d -> include(/%s/call_user_func_array2.inc) /%s/call_user_func_array2.php:4
     %f %d -> call_user_func_array('debug', array (0 => 'foo', 1 => array (0 => 1, 1 => 2))) /%s/call_user_func_array2.php:7
- %f %d -> debug('foo', array (0 => 1, 1 => 2)) /%s/call_user_func_array2.php:7
+ %f %d -> debug('foo', array (0 => 1, 1 => 2)) /%s/call_user_func_array2.php:0
     %f %d -> is_array(array (0 => 1, 1 => 2)) /%s/call_user_func_array2.inc:4
     %f %d -> call_user_func_array('debug', array (0 => 'bar', 1 => 'bar')) /%s/call_user_func_array2.php:10
- %f %d -> debug('bar', 'bar') /%s/call_user_func_array2.php:10
+ %f %d -> debug('bar', 'bar') /%s/call_user_func_array2.php:0
     %f %d -> is_array('bar') /%s/call_user_func_array2.inc:4
     %f %d -> is_object('bar') /%s/call_user_func_array2.inc:4
     %f %d -> is_resource('bar') /%s/call_user_func_array2.inc:4
Received on Fri Sep 23 2005 - 10:23:03 BST