2004-11-06 Zoltan Varga <vargaz@freemail.hu>

	* appdomain.c (ves_icall_System_AppDomain_GetData): Throw an
	exception instead of asserting if name is null.
	(ves_icall_System_AppDomain_GetData): Ditto.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 04fea13abee71e1ef90c6522227b5db6009f1b62..b12a9b0e3ae6520355ae99e91a26e2b4c74a9316 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-06  Zoltan Varga  <vargaz@freemail.hu>
+
+       * appdomain.c (ves_icall_System_AppDomain_GetData): Throw an 
+       exception instead of asserting if name is null.
+       (ves_icall_System_AppDomain_GetData): Ditto.
+
 2004-11-05  Zoltan Varga  <vargaz@freemail.hu>
 
        (ves_icall_get_enum_info): Avoid crash when called on a non-finished

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 29a4ee915d777724f8af3184f7767b56a485f80f..e6f49a51881457c3168736c76d24750914e4356a 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -286,7 +286,9 @@ ves_icall_System_AppDomain_GetData (MonoAppDomain *ad, MonoString *name)
        MONO_ARCH_SAVE_REGS;
 
        g_assert (ad != NULL);
-       g_assert (name != NULL);
+
+       if (name == NULL)
+               mono_raise_exception (mono_get_exception_argument_null ("name"));
 
        str = mono_string_to_utf8 (name);
 
@@ -330,7 +332,9 @@ ves_icall_System_AppDomain_SetData (MonoAppDomain *ad, MonoString *name, MonoObj
        MONO_ARCH_SAVE_REGS;
 
        g_assert (ad != NULL);
-       g_assert (name != NULL);
+
+       if (name == NULL)
+               mono_raise_exception (mono_get_exception_argument_null ("name"));
 
        mono_domain_lock (add);