diff options
author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-12 14:55:22 +0000 |
---|---|---|
committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-12 14:55:22 +0000 |
commit | d7da08aadd3b9768296db3c8744f58dd5e9697e8 (patch) | |
tree | ad9be0966183873c428ba7909fb27a7954b11705 /util.c | |
parent | 4ad01cad0105baceebea3b5e5afed09abdab48ee (diff) | |
download | ruby-d7da08aadd3b9768296db3c8744f58dd5e9697e8.tar.gz |
* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
returns NULL.)
* util.c (ruby_getcwd): fix memory leak on failure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -629,7 +629,6 @@ ruby_strdup(str) int len = strlen(str) + 1; tmp = xmalloc(len); - if (tmp == NULL) return NULL; memcpy(tmp, str, len); return tmp; @@ -643,7 +642,10 @@ ruby_getcwd() char *buf = xmalloc(size); while (!getcwd(buf, size)) { - if (errno != ERANGE) rb_sys_fail("getcwd"); + if (errno != ERANGE) { + free(buf); + rb_sys_fail("getcwd"); + } size *= 2; buf = xrealloc(buf, size); } @@ -654,6 +656,7 @@ ruby_getcwd() char *buf = xmalloc(PATH_MAX+1); if (!getwd(buf)) { + free(buf); rb_sys_fail("getwd"); } #endif |