Mem leaks in rb_str_become?

Hi,

	I'm not sure is following code doesn't mem leaks...

(Whole DIFF included - code will be marked)

Index: string.c
===================================================================
RCS file: /src/ruby/string.c,v
retrieving revision 1.106
diff -u -r1.106 string.c
--- string.c	2002/06/18 06:29:05	1.106
+++ string.c	2002/07/04 09:48:04
@@ -56,19 +56,24 @@
     const char *ptr;
     long len;
 {
-    VALUE str = rb_obj_alloc(klass);
-
+    VALUE str;
+    
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative string size (or size too big)");
     }
-
+    
+    str = rb_obj_alloc(klass);
     RSTRING(str)->len = len;
     RSTRING(str)->aux.capa = len;
-    RSTRING(str)->ptr = ALLOC_N(char,len+1);
+    RSTRING(str)->ptr = ALLOC_N(char, len + 1);
+    
     if (ptr) {
 	memcpy(RSTRING(str)->ptr, ptr, len);
+    } else {
+	memset(RSTRING(str)->ptr, '\0', len);
     }
     RSTRING(str)->ptr[len] = '\0';
+    
     return str;
 }
 
@@ -115,8 +120,11 @@
 str_new3(klass, str)
     VALUE klass, str;
 {
-    VALUE str2 = rb_obj_alloc(klass);
-
+    VALUE str2;
+    
+    Check_Type(str, T_STRING);
+    
+    str2 = rb_obj_alloc(klass);
     RSTRING(str2)->len = RSTRING(str)->len;
     RSTRING(str2)->ptr = RSTRING(str)->ptr;
     RSTRING(str2)->aux.shared = str;
@@ -139,6 +147,8 @@
 {
     VALUE klass, str;
 
+    Check_Type(orig, T_STRING);
+    
     klass = rb_obj_class(orig);
     if (FL_TEST(orig, ELTS_SHARED)) {
 	str = str_new3(klass, RSTRING(orig)->aux.shared);
@@ -176,12 +186,13 @@
 {
     VALUE str = rb_obj_alloc(rb_cString);
 
-    if (capa < STR_BUF_MIN_SIZE)
+    if (capa < STR_BUF_MIN_SIZE) {
 	capa = STR_BUF_MIN_SIZE;
+    }
     RSTRING(str)->ptr = 0;
     RSTRING(str)->len = 0;
     RSTRING(str)->aux.capa = capa;
-    RSTRING(str)->ptr = ALLOC_N(char, capa+1);
+    RSTRING(str)->ptr = ALLOC_N(char, capa + 1);
     RSTRING(str)->ptr[0] = '\0';
 
     return str;
@@ -194,7 +205,7 @@
     VALUE str;
     long len = strlen(ptr);
 
-    str = rb_str_buf_new(len + STR_BUF_MIN_SIZE);
+    str = rb_str_buf_new(len);
     rb_str_cat(str, ptr, len);
 
     return str;
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Here could be a problem: (in rb_str_become)
@@ -213,12 +224,13 @@
 {
     if (str == str2) return;
     if (NIL_P(str2)) {
-	RSTRING(str)->ptr = 0;
+	RSTRING(str)->ptr = 0; /* FIXME: MEM LEAKs here ???*/
 	RSTRING(str)->len = 0;
 	RSTRING(str)->aux.capa = 0;
 	return;
     }
-    if (FL_TEST(str, ELTS_SHARED)) free(RSTRING(str)->ptr);
+    Check_Type(str2, T_STRING);
+    if (FL_TEST(str, ELTS_SHARED)) free(RSTRING(str)->ptr); /* NOTE: What happends to ->ptr in orig STRING if we free this one??? BUG? */
     RSTRING(str)->ptr = RSTRING(str2)->ptr;
     RSTRING(str)->len = RSTRING(str2)->len;
     if (FL_TEST(str2, ELTS_SHARED|STR_ASSOC)) {
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

	Michal
	
-- 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Michal Rokos                         Czech Technical University, Prague
E-mail:[e-mail]      ICQ:36118339      Jabber:[e-mail]
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-