cvs: php-src /main main.c
| From: | Dmitry Stogov | Date: | Mon, 29 Aug 2005 06:51:52 +0000 |
| Subject: | cvs: php-src /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33680@lists.php.net to get a copy of this message | ||
dmitry Mon Aug 29 02:51:52 2005 EDT
Modified files:
/php-src/main main.c
Log:
Fixed SIGSEGV
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.645&r2=1.646&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.645 php-src/main/main.c:1.646
--- php-src/main/main.c:1.645 Wed Aug 17 03:52:17 2005
+++ php-src/main/main.c Mon Aug 29 02:51:51 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.645 2005/08/17 07:52:17 sniper Exp $ */
+/* $Id: main.c,v 1.646 2005/08/29 06:51:51 dmitry Exp $ */
/* {{{ includes
*/
@@ -572,7 +572,7 @@
stage = "PHP Shutdown";
} else {
function = get_active_function_name(TSRMLS_C);
- if (function && !USTR_LEN(function)) {
+ if (!function || !USTR_LEN(function)) {
stage = "Unknown";
function = NULL;
}
@@ -582,7 +582,7 @@
if (function) {
spprintf(&origin, 0, "%v%s%v(%s)", class_name, space, function, params);
} else {
- spprintf(&origin, 0, "%v", stage);
+ spprintf(&origin, 0, "%s", stage);
}
/* origin and buffer available, so lets come up with the error message */