diff options
author | Andrew Haley <aph@redhat.com> | 2007-07-15 17:37:43 +0000 |
---|---|---|
committer | Andrew Haley <aph@gcc.gnu.org> | 2007-07-15 17:37:43 +0000 |
commit | 759580edb78cd89a95a7f5560a90dbd3e2f2e697 (patch) | |
tree | 569aaae6046fc2654b4aab64a7a948d05eb5345c | |
parent | 16c16a2476732e37e0220accb906bf6a03f8a6c0 (diff) | |
download | gcc-759580edb78cd89a95a7f5560a90dbd3e2f2e697.zip gcc-759580edb78cd89a95a7f5560a90dbd3e2f2e697.tar.gz gcc-759580edb78cd89a95a7f5560a90dbd3e2f2e697.tar.bz2 |
unwind-sjlj.c (_Unwind_GetIPInfo): Check for context->fc != NULL before looking in the context.
2007-07-15 Andrew Haley <aph@redhat.com>
* unwind-sjlj.c (_Unwind_GetIPInfo): Check for context->fc !=
NULL before looking in the context.
From-SVN: r126658
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/unwind-sjlj.c | 5 |
2 files changed, 9 insertions, 1 deletions
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 <aph@redhat.com> + + * unwind-sjlj.c (_Unwind_GetIPInfo): Check for context->fc != NULL + before looking in the context. + 2007-07-15 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> 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. */ |