diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-15 17:37:43 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-15 17:37:43 +0000 |
| commit | c27697e2a08f14335730fea7b189d57ffb49e8c4 (patch) | |
| tree | 569aaae6046fc2654b4aab64a7a948d05eb5345c | |
| parent | df6b92e4d0861750f3bd6d40bce36c67d42dd6a2 (diff) | |
| download | gcc-c27697e2a08f14335730fea7b189d57ffb49e8c4.tar.gz | |
2007-07-15 Andrew Haley <aph@redhat.com>
* unwind-sjlj.c (_Unwind_GetIPInfo): Check for context->fc !=
NULL before looking in the context.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126658 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 7ca3bbf8607..e58f4dffd7d 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 e1a62c9e025..c541bd5f8f9 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. */ |