[xdebug-dev] xdebug xdebug/xdebug.c - Fixed ifdef nesting.

Date: Thu Aug 11 13:39:58 CEST 2005
User: Derick Rethans
Directory: xdebug

Log Message:
- Fixed bug #132: use of eval causes a segmentation fault.
- Fixed ifdef nesting.

Modified files:
           xdebug/xdebug.c (version: 1.268)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- xdebug/xdebug.c:1.267 Wed Aug 10 15:18:33 2005 GMT
+++ xdebug/xdebug.c Thu Aug 11 09:39:58 2005 GMT
@@ -916,7 +916,9 @@
                 if (tmp->function.type == XFUNC_EVAL) {
                         int is_var;
 
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 0) || PHP_MAJOR_VERSION == 4
                         tmp->include_filename = get_zval_value(get_zval(&zdata->opline->op1, zdata->Ts, &is_var), 0);
+#endif
                 } else if (XG(collect_includes)) {
                         tmp->include_filename = xdstrdup(zend_get_executed_filename(TSRMLS_C));
                 }
@@ -2376,6 +2378,7 @@
         return zend_startup_module(&xdebug_module_entry TSRMLS_CC);
 #else
         return zend_startup_module(&xdebug_module_entry);
+#endif
 }
 
 ZEND_DLEXPORT void xdebug_zend_shutdown(zend_extension *extension)
Received on Thu Aug 11 2005 - 13:40:04 BST