2004-05-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* appdomain.c: fixed check for 'neutral' culture and removed warning.
	* reflection.c: fix bug when parsing a full type name and Version is not
	the last thing in the string.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 62a2f65cfb4e03fce9a8dea008979e1e96d0e70d..251fa41f8de47219ee57c3b734dd628f738fea80 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * appdomain.c: fixed check for 'neutral' culture and removed warning.
+       * reflection.c: fix bug when parsing a full type name and Version is not
+       the last thing in the string.
+
 2004-05-03  Zoltan Varga  <vargaz@freemail.hu>
 
        * appdomain.c (get_info_from_assembly_name): Strdup "" to prevent

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index efe3688e8126cea9ea4ab169646ec8fa137cb6d7..109f9541055dc2e1d29c52d89c27dbaccaa60a16 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -648,7 +648,7 @@ real_load (gchar **search_path, const gchar *culture, gchar *filename)
                if (**path == '\0')
                        continue; /* Ignore empty ApplicationBase */
 
-               if (culture && g_strcasecmp (culture, "neutral"))
+               if (culture && *culture != '\0') /* !neutral */
                        fullpath = g_build_filename (*path, culture, filename, NULL);
                else
                        fullpath = g_build_filename (*path, filename, NULL);
@@ -811,7 +811,7 @@ get_info_from_assembly_name (MonoString *assRef, MonoAssemblyName *aname)
                        tmp++;
                        g_free (t);
                        if (g_strcasecmp (aname->culture, "neutral") == 0) {
-                               g_free (aname->culture);
+                               g_free ((void *) aname->culture);
                                aname->culture = g_strdup ("");
                        }
                        continue;

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index cecfcb2c3e62eae636aec982009ea43a7af25aea..99cdf8274e77ee31b894b6badd0d2e2560a1f072 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -5213,6 +5213,7 @@ assembly_name_to_aname (MonoAssemblyName *assembly, char *p) {
                        assembly->revision = strtoul (p, &s, 10);
                        if (s == p)
                                return 1;
+                       p = s;
                } else if (*p == 'C' && strncmp (p, "Culture=", 8) == 0) {
                        p += 8;
                        if (strncmp (p, "neutral", 7) == 0) {