diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2006-10-19 07:00:48 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2006-10-19 07:00:48 +0400 |
| commit | c83bb070672f0eb14b38b0f97a4cb938154982d1 (patch) | |
| tree | 024ba5bde8c3e6e549887c5eaa725dc3eda029b6 | |
| parent | d973adf739079a754013a7aabaf062c6e8362d58 (diff) | |
Backport this fix
svn path=/branches/mono-1-1-18/mono/; revision=66810
| -rw-r--r-- | mono/io-layer/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/io-layer/io-portability.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog index 8df578897fd..3ef0bd1f9e5 100644 --- a/mono/io-layer/ChangeLog +++ b/mono/io-layer/ChangeLog @@ -1,3 +1,7 @@ +2006-10-18 Miguel de Icaza <miguel@novell.com> + + * io-portability.c (find_in_dir): First string dup, then closedir. + 2006-10-12 Dick Porter <dick@ximian.com> * processes.c (_wapi_process_reap): Unref a process handle if we diff --git a/mono/io-layer/io-portability.c b/mono/io-layer/io-portability.c index e4bef41b903..f739b1fac77 100644 --- a/mono/io-layer/io-portability.c +++ b/mono/io-layer/io-portability.c @@ -88,13 +88,16 @@ static gchar *find_in_dir (DIR *current, const gchar *name) #endif if (!g_ascii_strcasecmp (name, entry->d_name)) { + char *ret; + #ifdef DEBUG g_message ("%s: matched [%s] to [%s]\n", __func__, entry->d_name, name); #endif - + + ret = g_strdup (entry->d_name); closedir (current); - return(g_strdup (entry->d_name)); + return ret; } } |