summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2005-08-29 06:51:51 +0000
committerDmitry Stogov <dmitry@php.net>2005-08-29 06:51:51 +0000
commit7999c0c3d46fc64dd85f0600d8fe450b9bdf7a37 (patch)
tree614878c6cbf21f7e17de9877ff12cc0063a9f8ff
parenta3b7eb2284427373aad3259383dd4f96b8120ed2 (diff)
downloadphp-git-7999c0c3d46fc64dd85f0600d8fe450b9bdf7a37.tar.gz
Fixed SIGSEGV
-rw-r--r--main/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c
index 6bc2a45f96..0fa9fc0946 100644
--- a/main/main.c
+++ b/main/main.c
@@ -572,7 +572,7 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
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 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
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 */