2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e3b31eb93e..9cc7b7f545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Sep 12 23:46:23 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
+	  returns NULL.)
+
+	* util.c (ruby_getcwd): fix memory leak on failure.
+
 Sun Sep 12 02:41:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and 
diff --git a/util.c b/util.c
index c29433937e..6f76519176 100644
--- a/util.c
+++ b/util.c
@@ -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