From a7182c20eb6202738b8fe05c204822f7a94222a5 Mon Sep 17 00:00:00 2001 From: Masamitsu MURASE Date: Mon, 10 Dec 2012 02:29:38 +0900 Subject: Fix memory leak in String#to_i and String#to_f. --- src/string.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/string.c') diff --git a/src/string.c b/src/string.c index 7ab6e5806..ac79f7c58 100644 --- a/src/string.c +++ b/src/string.c @@ -2544,12 +2544,8 @@ mrb_str_to_inum(mrb_state *mrb, mrb_value str, int base, int badcheck) if (s) { len = RSTRING_LEN(str); if (s[len]) { /* no sentinel somehow */ - char *p = (char *)mrb_malloc(mrb, len+1); - - //MEMCPY(p, s, char, len); - memcpy(p, s, len); - p[len] = '\0'; - s = p; + struct RString *temp_str = str_new(mrb, s, len); + s = temp_str->ptr; } } return mrb_cstr_to_inum(mrb, s, base, badcheck); @@ -2681,11 +2677,8 @@ mrb_str_to_dbl(mrb_state *mrb, mrb_value str, int badcheck) mrb_raise(mrb, E_ARGUMENT_ERROR, "string for Float contains null byte"); } if (s[len]) { /* no sentinel somehow */ - char *p = (char *)mrb_malloc(mrb, len+1); - - memcpy(p, s, len); - p[len] = '\0'; - s = p; + struct RString *temp_str = str_new(mrb, s, len); + s = temp_str->ptr; } } return mrb_cstr_to_dbl(mrb, s, badcheck); -- cgit v1.2.3