From: aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 15 Jul 2007 17:37:43 +0000 (+0000)
Subject: 2007-07-15  Andrew Haley  <aph@redhat.com>
X-Git-Tag: upstream/4.9.2~47440
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c27697e2a08f14335730fea7b189d57ffb49e8c4;p=platform%2Fupstream%2Flinaro-gcc.git

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
---

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.  */