2008-11-20 Zoltan Varga <vargaz@gmail.com>

	* exceptions-amd64.c (mono_arch_find_jit_info): Avoid reading random
	values from the LMF. Fixes #444383.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 957a277f43dae28980a6c8b8140f71d3cbbad3fe..cbd44ebdeeb4576b6230c939856fa1311b116aa7 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2008-11-20  Zoltan Varga  <vargaz@gmail.com>
 
+       * exceptions-amd64.c (mono_arch_find_jit_info): Avoid reading random
+       values from the LMF. Fixes #444383.
+
        * aot-compiler.c (mono_save_xdebug_info): Add locking.
 
 2008-11-19  Rodrigo Kumpera  <rkumpera@novell.com>

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 84dca7f4dd50cce0f4e67fa25d23af5466253233..d56962d12b09ae7baec775c51ffd35a0dbcd7175 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -679,12 +679,8 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
 
                ji = mono_jit_info_table_find (domain, (gpointer)rip);
                if (!ji) {
-                       if (!(*lmf)->method)
-                               /* Top LMF entry */
-                               return (gpointer)-1;
-                       /* Trampoline lmf frame */
-                       memset (res, 0, sizeof (MonoJitInfo));
-                       res->method = (*lmf)->method;
+                       // FIXME: This can happen with multiple appdomains (bug #444383)
+                       return (gpointer)-1;
                }
 
                new_ctx->rip = rip;