2007-07-06 William Holmes <billholmes54@gmail.com>

        * assembly.c: Added a continue statement in
        * probe_for_partial_name when
         parse_assembly_directory_name fails.  Fixes : 82002

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 6e5ac379890453f0aa976a934b82b87aa4d42741..1c64c48dad6eca65d2fe9d38c47ccc9daabe0dc7 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-06  William Holmes  <billholmes54@gmail.com>
+
+       * assembly.c: Added a continue statement in probe_for_partial_name when
+        parse_assembly_directory_name fails.  Fixes : 82002
+
 2007-07-06  Rodrigo Kumpera  <rkumpera@novell.com>
 
        * verify.c (check_unmanaged_pointer_type): renamed to check_unverifiable_type

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 332a317d6275067c9fecc21962ca160ea2dc68b2..0360aae15b11f82f3dec6972fd661f9191aaf044 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -1805,7 +1805,8 @@ probe_for_partial_name (const char *basepath, const char *fullname, MonoAssembly
        while ((direntry = g_dir_read_name (dirhandle))) {
                gboolean match = TRUE;
                
-               parse_assembly_directory_name (aname->name, direntry, &gac_aname);
+               if(!parse_assembly_directory_name (aname->name, direntry, &gac_aname))
+                       continue;
                
                if (aname->culture != NULL && strcmp (aname->culture, gac_aname.culture) != 0)
                        match = FALSE;