diff options
| author | Geoff Norton <grompf@sublimeintervention.com> | 2010-04-08 07:17:36 +0400 |
|---|---|---|
| committer | Geoff Norton <grompf@sublimeintervention.com> | 2010-04-08 07:17:36 +0400 |
| commit | b458b8ab360cea5b16ff66759d469be958a319dc (patch) | |
| tree | e9f18478fefda0a7f91e35b9e131f3d0f84a18b0 | |
| parent | 90c9532dc2830c5946a3a8dbb9e6cd636b726b00 (diff) | |
2010-04-07 Geoff Norton <gnorton@novell.com>
* domain.c: Avoid a deadlock on osx. Fixes #565765
svn path=/branches/mono-2-6/mono/; revision=155022
| -rw-r--r-- | mono/metadata/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/metadata/domain.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index fdb0fe5bf5c..d59155493ed 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,7 @@ +2010-04-07 Geoff Norton <gnorton@novell.com> + + * domain.c: Avoid a deadlock on osx. Fixes #565765 + 2010-04-08 Zoltan Varga <vargaz@gmail.com> * icall.c (ves_icall_System_Enum_ToObject): Avoid a crash for unfinished type diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c index f92678c2cce..95e850baae5 100644 --- a/mono/metadata/domain.c +++ b/mono/metadata/domain.c @@ -434,6 +434,9 @@ mono_jit_info_table_find (MonoDomain *domain, char *addr) } while (chunk_pos < table->num_chunks); not_found: + if (!hp) + return NULL; + mono_hazard_pointer_clear (hp, JIT_INFO_TABLE_HAZARD_INDEX); mono_hazard_pointer_clear (hp, JIT_INFO_HAZARD_INDEX); |