Author: miguel
Date: 2007-01-01 12:56:18 -0500 (Mon, 01 Jan 2007)
New Revision: 70323

Modified:
   branches/mono-1-2-2/mono/mono/io-layer/ChangeLog
   branches/mono-1-2-2/mono/mono/io-layer/io-portability.c
Log:
Backport r70302 to 1.2.2

Modified: branches/mono-1-2-2/mono/mono/io-layer/ChangeLog
===================================================================
--- branches/mono-1-2-2/mono/mono/io-layer/ChangeLog    2007-01-01 17:49:03 UTC 
(rev 70322)
+++ branches/mono-1-2-2/mono/mono/io-layer/ChangeLog    2007-01-01 17:56:18 UTC 
(rev 70323)
@@ -1,3 +1,9 @@
+2006-12-31  Miguel de Icaza  <[EMAIL PROTECTED]>
+ 
+       * io-portability.c (find_file): Do not abort if an empty filename
+       has been passed.  This fixes the case where MONO_IOMAP=all would
+       assert if Directory.Exists ("") was called.
+ 
 Mon Nov 27 13:12:17 GMT 2006 Paolo Molaro <[EMAIL PROTECTED]>
 
        * atomic.h: fix arm compare and exchange (bug #78500).

Modified: branches/mono-1-2-2/mono/mono/io-layer/io-portability.c
===================================================================
--- branches/mono-1-2-2/mono/mono/io-layer/io-portability.c     2007-01-01 
17:49:03 UTC (rev 70322)
+++ branches/mono-1-2-2/mono/mono/io-layer/io-portability.c     2007-01-01 
17:56:18 UTC (rev 70323)
@@ -188,9 +188,12 @@
        while(components[num_components] != NULL) {
                num_components++;
        }
-       g_assert (num_components > 0);
+       g_free (new_pathname);
        
-       g_free (new_pathname);
+       if (num_components == 0){
+               return NULL;
+       }
+       
 
        new_components = (gchar **)g_new0 (gchar **, num_components + 1);
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to