From 222d0d7acd12e63fa75475704090e4fd0b35b8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Mon, 19 Jan 1998 12:51:40 -0800
Subject: [PATCH] fatal bugfix
Rev: src/cpp.c:1.10
---
src/cpp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/cpp.c b/src/cpp.c
index b932e38ed5..407e184cb0 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -1847,6 +1847,7 @@ static void check_constant(struct cpp *this,
struct define_argument *args,
dynamic_buffer *tmp)
{
+ struct svalue *save_stack=sp;
struct svalue *sv;
char *data=args[0].arg;
int res,dlen,len=args[0].len;
@@ -1907,7 +1908,8 @@ static void check_constant(struct cpp *this,
cpp_error(this, "Garbage characters in constant()\n");
}
}
-
+
+ pop_n_elems(sp-save_stack);
low_my_binary_strcat(res?" 1 ":" 0 ", 3,tmp);
}
@@ -1917,6 +1919,7 @@ static int do_safe_index_call(struct pike_string *s)
{
int res;
JMP_BUF recovery;
+ if(!s) return 0;
if (SETJMP(recovery)) {
res = 0;
--
GitLab