diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2009-12-09 18:04:28 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2009-12-09 18:04:28 +0300 |
| commit | c8167fc35610c38bd8c0760285767f4bce3c41bf (patch) | |
| tree | 1e61773e26f9f404ac6d62580899cfc1e464d2bd | |
| parent | 8ff52f4e318b79e6db0fd574ad6c0b6a945e30e7 (diff) | |
2009-12-09 Zoltan Varga <vargaz@gmail.com>
* debugger-agent.c (start_runtime_invoke): Fix a crash if this is called
on the debugger thread.
svn path=/branches/mono-2-6/mono/; revision=147913
| -rw-r--r-- | mono/mini/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/mini/debugger-agent.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 6bdbee24434..89f53a95537 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,8 @@ +2009-12-09 Zoltan Varga <vargaz@gmail.com> + + * debugger-agent.c (start_runtime_invoke): Fix a crash if this is called + on the debugger thread. + 2009-12-08 Geoff Norton <gnorton@novell.com> * debugger-agent.c: Refactor the mono_runtime_invoke guarding against diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c index 099b0937d92..09a2dc578f1 100644 --- a/mono/mini/debugger-agent.c +++ b/mono/mini/debugger-agent.c @@ -2760,7 +2760,9 @@ start_runtime_invoke (MonoProfiler *prof, MonoMethod *method) mono_loader_lock (); tls = mono_g_hash_table_lookup (thread_to_tls, thread); - tls->invoke_addr = stackptr; + /* Could be the debugger thread with assembly/type load hooks */ + if (tls) + tls->invoke_addr = stackptr; mono_loader_unlock (); } |