admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #606 from masamitsu-murase/fix_memory_leak_in_string_to_i

Browse Source 
Fix memory leak in String#to_i and String#to_f.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2012-12-09 21:43:31 -08:00
parent 453980d76a a7182c20eb
commit dc18042e05
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+4 -11
View File
@@ -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);