[xdebug-dev] xdebug xdebug/xdebug_code_coverage.c xdebug/tests/bug00422.inc xdebug/tests/bug00422.phpt - Fixed bug #422: Segfaults when using code coverage with a parse error in the

Date: Sat Jan 24 21:00:12 CET 2009
User: Derick Rethans
Directory: xdebug

Log Message:
[4.00]
- Fixed bug #422: Segfaults when using code coverage with a parse error in the
  script.

Modified files:
           xdebug/xdebug_code_coverage.c (version: 1.47)
Added files:
           xdebug/tests/bug00422.inc (new version: 1.1)
           xdebug/tests/bug00422.phpt (new version: 1.1)

[FILE: /xdebug/xdebug_code_coverage.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xdebug/xdebug_code_coverage.c:1.46 Mon Jan 05 16:24:34 2009 GMT
+++ xdebug/xdebug_code_coverage.c Sat Jan 24 19:00:12 2009 GMT
@@ -236,7 +236,7 @@
         }
 
         /* Run dead code analysis if requested */
- if (XG(code_coverage_dead_code_analysis)) {
+ if (XG(code_coverage_dead_code_analysis) && opa->done_pass_two) {
                 set = xdebug_set_create(opa->last);
                 xdebug_analyse_branch(opa, 0, set);
         }

[FILE: /xdebug/tests/bug00422.inc]

<?php
class DB
{
    function f()
    {
        if (true) {}
        $obj =& new a;
    }
}
?>

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

--TEST--
Test for bug #422: Segfaults when using code coverage with a parse error in the script.
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
--INI--
xdebug.default_enable=1
xdebug.auto_trace=0
xdebug.trace_options=0
xdebug.trace_output_dir=/tmp
xdebug.collect_params=1
xdebug.collect_return=0
xdebug.auto_profile=0
xdebug.profiler_enable=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.extended_info=1
--FILE--
<?php
function hdl(){}
set_error_handler('hdl');
xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
require_once 'bug00422.inc';
echo "END";
?>
--EXPECT--
END
Received on Sat Jan 24 2009 - 21:13:06 GMT