Initialize context before RtlContextCapture

	* exceptions.cc (call_signal_handler): Zero initialize context and set
	context flags, as RlCaptureContext doesn't.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 50fc01ef9507ad594e3a0321918f23ac10755779..6d772c2fe200df96765763d45c5809a09d028e7d 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-04  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
+       * exceptions.cc (call_signal_handler): Zero initialize context and set
+       context flags, as RlCaptureContext doesn't.
+
 2015-04-09  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_dsp.cc (fhandler_dev_dsp::open): Call open_null.

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0d1f36d507a1760fa617089e1cb7602edc019e98..fe543aee4c8b7306f1118571d9faccc89e06e2e4 100644 (file)
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1496,8 +1496,12 @@ _cygtls::call_signal_handler ()
       if (thissi.si_cyg)
         memcpy (&thiscontext.uc_mcontext, ((cygwin_exception *)thissi.si_cyg)->context(), sizeof(CONTEXT));
       else
-        RtlCaptureContext ((CONTEXT *)&thiscontext.uc_mcontext);
-        /* FIXME: Really this should be the context which the signal interrupted? */
+       {
+         /* FIXME: Really this should be the context which the signal interrupted? */
+         memset(&thiscontext.uc_mcontext, 0, sizeof(struct __mcontext));
+         thiscontext.uc_mcontext.ctxflags = CONTEXT_FULL;
+         RtlCaptureContext ((CONTEXT *)&thiscontext.uc_mcontext);
+       }
 
       /* FIXME: If/when sigaltstack is implemented, this will need to do
          something more complicated */