From 759580edb78cd89a95a7f5560a90dbd3e2f2e697 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Sun, 15 Jul 2007 17:37:43 +0000 Subject: unwind-sjlj.c (_Unwind_GetIPInfo): Check for context->fc != NULL before looking in the context. 2007-07-15 Andrew Haley * unwind-sjlj.c (_Unwind_GetIPInfo): Check for context->fc != NULL before looking in the context. From-SVN: r126658 --- gcc/ChangeLog | 5 +++++ gcc/unwind-sjlj.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7ca3bbf..e58f4df 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2007-07-15 Andrew Haley + + * unwind-sjlj.c (_Unwind_GetIPInfo): Check for context->fc != NULL + before looking in the context. + 2007-07-15 John David Anglin PR middle-end/32398 diff --git a/gcc/unwind-sjlj.c b/gcc/unwind-sjlj.c index e1a62c9..c541bd5 100644 --- a/gcc/unwind-sjlj.c +++ b/gcc/unwind-sjlj.c @@ -222,7 +222,10 @@ _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn) { *ip_before_insn = 0; - return context->fc->call_site + 1; + if (context->fc != NULL) + return context->fc->call_site + 1; + else + return 0; } /* Set the return landing pad index in CONTEXT. */ -- cgit v1.1