2010-01-21 Zoltan Varga <vargaz@gmail.com>

	* exceptions-amd64.c (mono_arch_notify_pending_exc): Avoid a crash if the
	thread has not fully started yet.

svn path=/trunk/mono/; revision=150048

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 0a63581a10dd8324d10826762dfadfba7ddfd0b3..5536dd85a0e7042b71d248761a59082be24881e3 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-21  Zoltan Varga  <vargaz@gmail.com>
+
+       * exceptions-amd64.c (mono_arch_notify_pending_exc): Avoid a crash if the
+       thread has not fully started yet.
+
 2010-01-21  Zoltan Varga  <vargaz@gmail.com>
 
        * aot-compiler.c (can_marshal_struct): Allow marshalling enums.

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 9f1caecab021d971b03e1d0d79b3769e3579c6ad..b0db85e087dd74160f5843c28673c356cd0bbe61 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -1019,6 +1019,10 @@ mono_arch_notify_pending_exc (void)
 {
        MonoLMF *lmf = mono_get_lmf ();
 
+       if (!lmf)
+               /* Not yet started */
+               return;
+
        if (lmf->rsp == 0)
                /* Initial LMF */
                return;