* appdomain.c: Handle PublicKeyToken=null properly.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 8986683f1a06187d589ed82baf51c8fc9b2048da..80c1d8c27aaecf22e2cea62f9a840fe1ff4d0d1b 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-05  Jackson Harper  <jackson@ximian.com>
+
+       * appdomain.c: Handle PublicKeyToken=null properly.
+       
 2004-05-05  Sebastien Pouliot  <sebastien@ximian.com>
 
        * environment.c|h: Added icall ves_icall_System_Environment_

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 8bf99ce8ad8de73891fa4feb1845d1895746ab60..d0052f7f835ade929e81cd62187f65e53b4370de 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -820,13 +820,13 @@ get_info_from_assembly_name (MonoString *assRef, MonoAssemblyName *aname)
                if (!g_ascii_strncasecmp (value, "PublicKeyToken=", 15)) {
                        tmp++;
                        value += 15;
-                       if (*value && strcmp (value, "null")) {
+                       if (*value && strncmp (value, "null", 4)) {
                                gchar *t = g_strdup (value);
                                g_strchug (t);
                                aname->public_tok_value = g_strdup (g_strchomp (value));
                                g_free (t);
-                               continue;
                        }
+                       continue;
                }
 
                g_strfreev (parts);