2006-08-18 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* image.c: don't fail when the link points to an absolute path.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 2fac06883bc44f277fa610a977b4d15d6ca01dcf..f459e86270b6e5acf1c839cc0a4195b1e3ff9238 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-18 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * image.c: don't fail when the link points to an absolute path.
+
 2006-08-18  Sebastien Pouliot  <sebastien@ximian.com>
 
        * decimal.c: Remove dead code (unrequired check) in mono_decimalIncr.

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index df89f2b79bc66b1fdcfc7181b0d879c6ea182818..2dbef765d312168dc08812a3f613d07842f9cb0f 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -159,9 +159,13 @@ full_path (const char *path)
                }
                
                buffer [n] = 0;
-               dir = g_path_get_dirname (p);
-               concat = g_build_filename (dir, buffer, NULL);
-               g_free (dir);
+               if (!g_path_is_absolute (buffer)) {
+                       dir = g_path_get_dirname (p);
+                       concat = g_build_filename (dir, buffer, NULL);
+                       g_free (dir);
+               } else {
+                       concat = g_strdup (buffer);
+               }
                g_free (p);
                p = canonicalize_path (concat);
                g_free (concat);