Merged pull request #268

tests/bug01266.phpt

@@ -1,5 +1,8 @@
 --TEST--
 Test for bug #1266: xdebug_dump_superglobals() always dumps empty $_SESSION stack on PHP 7
+--SKIPIF--
+<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip session extension not available"; ?>
 --INI--
 xdebug.dump.SESSION=*
 --FILE--

tests/bug01288.phpt

@@ -0,0 +1,32 @@
+--TEST--
+Test for bug #1288: Segfault when uncaught exception message does not contain " in "
+--INI--
+xdebug.default_enable=1
+html_errors=0
+xdebug.collect_params=4
+--FILE--
+<?php
+
+class React_Exception extends Exception
+{
+    public function __toString()
+    {
+        return "Custom message";
+        return "Custom message in random"; // this does not segfault because of ' in '.
+    }
+}
+
+set_error_handler(function(){ throw new React_Exception('waa');});
+
+
+$_SERVER['SERVER_PROTOCOL'];
+?>
+--EXPECTF--
+Fatal error: Uncaught Custom message
+  thrown in %sbug01288.php on line 12
+
+React_Exception: waa in %sbug01288.php on line 12
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug01288.php:0
+%w%f %w%d   2. {closure:%sbug01288.php:12-12}(8, 'Undefined index: SERVER_PROTOCOL', '%sbug01288.php', %s) %sbug01288.php:15

xdebug_stack.c

@@ -764,11 +764,7 @@ void xdebug_error_cb(int type, const char *error_filename, const uint error_line
 			char *printable_stack;
 
 			/* We need to see if we have an uncaught exception fatal error now */
-#if PHP_VERSION_ID >= 70000
 			if (type == E_ERROR && strncmp(buffer, "Uncaught ", 9) == 0) {
-#else
-			if (type == E_ERROR && strncmp(buffer, "Uncaught exception", 18) == 0) {
-#endif
 				xdebug_str str = XDEBUG_STR_INITIALIZER;
 				char *tmp_buf, *p;
 
@@ -782,8 +778,14 @@ void xdebug_error_cb(int type, const char *error_filename, const uint error_line
 					p = xdebug_strrstr(buffer, " in ");
 #else
 					/* find last quote */
-					p = ((char *) zend_memrchr(buffer, '\'', p - buffer)) + 1;
+					p = ((char *) zend_memrchr(buffer, '\'', p - buffer));
+					if (p) {
+						p++;
+					}
 #endif
+					if (!p) {
+						p = buffer + strlen(buffer);
+					}
 				}
 				/* Create new buffer */
 				tmp_buf = calloc(p - buffer + 1, 1);