From 8286b51cdf6a78f39956a46c8a01350d415c5f16 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 22 Jan 2010 08:22:50 +0000 Subject: [PATCH] 2010-01-21 Zoltan Varga * 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 --- mono/mini/ChangeLog | 5 +++++ mono/mini/exceptions-amd64.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 0a63581a10d..5536dd85a0e 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,8 @@ +2010-01-21 Zoltan Varga + + * exceptions-amd64.c (mono_arch_notify_pending_exc): Avoid a crash if the + thread has not fully started yet. + 2010-01-21 Zoltan Varga * aot-compiler.c (can_marshal_struct): Allow marshalling enums. diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c index 9f1caecab02..b0db85e087d 100644 --- 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; -- 2.25.1