Skip to content

Commit

Permalink
* win32/win32.c (readdir_internal): free old temporary filename.
Browse files Browse the repository at this point in the history
	  [ruby-core:24820]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
unak committed Aug 12, 2009
1 parent 265bd9e commit 56e69d7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Wed Aug 12 14:14:42 2009 NAKAMURA Usaku <[email protected]>

* win32/win32.c (readdir_internal): free old temporary filename.
[ruby-core:24820]

Wed Aug 12 12:59:51 2009 Nobuyoshi Nakada <[email protected]>

* string.c (rb_str_new_frozen): must not change encoding of frozen
Expand Down
6 changes: 4 additions & 2 deletions win32/win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -1765,6 +1765,8 @@ readdir_internal(DIR *dirp, BOOL (*conv)(const WCHAR *, struct direct *, rb_enco
//
// first set up the structure to return
//
if (dirp->dirstr.d_name)
free(dirp->dirstr.d_name);
conv(dirp->curr, &dirp->dirstr, enc);

//
Expand Down Expand Up @@ -3585,8 +3587,8 @@ rb_w32_getcwd(char *buffer, int size)
size = len;
if (!p) {
errno = ENOMEM;
return NULL;
}
return NULL;
}
}

if (!GetCurrentDirectory(size, p)) {
Expand Down

0 comments on commit 56e69d7

Please sign in to comment.