phanto          Wed Feb 19 11:17:16 2003 EDT

  Modified files:              
    /php4/main  main.c 
  Log:
  prevent xdebug from crashing
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.527 php4/main/main.c:1.528
--- php4/main/main.c:1.527      Tue Feb 18 04:37:54 2003
+++ php4/main/main.c    Wed Feb 19 11:17:15 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.527 2003/02/18 09:37:54 wez Exp $ */
+/* $Id: main.c,v 1.528 2003/02/19 16:17:15 phanto Exp $ */
 
 /* {{{ includes
  */
@@ -1064,6 +1064,10 @@
 void php_request_shutdown(void *dummy)
 {
        TSRMLS_FETCH();
+
+       /* EG(opline_ptr) points into nirvana and therefore cannot be safely accessed
+          inside zend_executor callback functions. */
+       EG(opline_ptr) = NULL;
 
        zend_try {
                php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1) 
TSRMLS_CC);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to