[xdebug-dev] xdebug xdebug/test-5.2.sh xdebug/xdebug.c xdebug/tests/bug00315.phpt - MFH: Fixed bug #315: Xdebug crashes when including a file that doesn't exist.

Date: Thu Oct 25 22:44:16 CEST 2007
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- MFH: Fixed bug #315: Xdebug crashes when including a file that doesn't exist.

Modified files:
           xdebug/test-5.2.sh (version: 1.1.2.1)
           xdebug/xdebug.c (version: 1.400.2.5)
Added files:
           xdebug/tests/bug00315.phpt (new version: 1.1.2.2)

[FILE: /xdebug/test-5.2.sh]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- xdebug/test-5.2.sh:1.1 Sat Dec 23 19:04:21 2006 GMT
+++ xdebug/test-5.2.sh Thu Oct 25 18:44:15 2007 GMT
@@ -1 +1 @@
-TEST_PHP_EXECUTABLE=`which php-5.2dev` php-5.2dev -dxdebug.auto_trace=0 /dat/dev/php/php-5.2dev/run-tests.php tests/*.phpt
+TEST_PHP_EXECUTABLE=`which php-5.2dev` php-5.2dev -dxdebug.auto_trace=0 /home/derick/dev/php/php-5.2dev/run-tests.php tests/*.phpt

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.400.2.4
retrieving revision 1.400.2.5
diff -u -r1.400.2.4 -r1.400.2.5
--- xdebug/xdebug.c:1.400.2.4 Sat Oct 20 14:37:49 2007 GMT
+++ xdebug/xdebug.c Thu Oct 25 18:44:15 2007 GMT
@@ -2339,10 +2339,13 @@
         zend_op_array *op_array;
         
         op_array = old_compile_file(file_handle, type TSRMLS_CC);
- op_array->reserved[XG(reserved_offset)] = 0;
 
- if (XG(do_code_coverage) && XG(code_coverage_unused)) {
- xdebug_prefill_code_coverage(op_array TSRMLS_CC);
+ if (op_array) {
+ op_array->reserved[XG(reserved_offset)] = 0;
+
+ if (XG(do_code_coverage) && XG(code_coverage_unused)) {
+ xdebug_prefill_code_coverage(op_array TSRMLS_CC);
+ }
         }
         return op_array;
 }

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

--TEST--
Test for bug #315: Xdebug crashes when including a file that doesn't exist.
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
--INI--
xdebug.default_enable=1
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.profiler_enable=0
xdebug.trace_format=0
--FILE--
<?php
@include 'this-file-does-not-exist.php';
echo "ALIVE\n";
?>
--EXPECT--
ALIVE
Received on Thu Oct 25 2007 - 22:46:49 BST