diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-06-16 11:46:40 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-06-16 11:46:40 +0900 |
| commit | e96f254ead50f70b49b7055eaa132dc4f756a8e3 (patch) | |
| tree | a54c5e76f6690948ed78710848a1ac6955252593 | |
| parent | 473b2bb20df8e67cc3846c2ced8ea72513a477be (diff) | |
| download | mruby-e96f254ead50f70b49b7055eaa132dc4f756a8e3.tar.gz mruby-e96f254ead50f70b49b7055eaa132dc4f756a8e3.zip | |
Use `mrb_str_new()` instead of `malloc()`; ref #3701
Otherwise the function may terminate and cause memory leaks.
| -rw-r--r-- | mrbgems/mruby-string-ext/src/string.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 138b9e3cf..c8f14040a 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -599,14 +599,15 @@ mrb_str_upto(mrb_state *mrb, mrb_value beg) } /* both edges are all digits */ if (ISDIGIT(RSTRING_PTR(beg)[0]) && ISDIGIT(RSTRING_PTR(end)[0]) && - all_digits_p(RSTRING_PTR(beg), RSTRING_LEN(beg)) && - all_digits_p(RSTRING_PTR(end), RSTRING_LEN(end))) { + all_digits_p(RSTRING_PTR(beg), RSTRING_LEN(beg)) && + all_digits_p(RSTRING_PTR(end), RSTRING_LEN(end))) { + int ai = mrb_gc_arena_save(mrb); mrb_int min_width = RSTRING_LEN(beg); mrb_int max_width = RSTRING_LEN(end); mrb_int bi = mrb_int(mrb, mrb_str_to_inum(mrb, beg, 10, FALSE)); mrb_int ei = mrb_int(mrb, mrb_str_to_inum(mrb, end, 10, FALSE)); - char *buf = (char *)mrb_malloc(mrb, max_width+1); - int ai = mrb_gc_arena_save(mrb); + mrb_value str = mrb_str_new(mrb, NULL, max_width); + char *buf = RSTRING_PTR(str); while (bi <= ei) { if (excl && bi == ei) break; @@ -616,7 +617,6 @@ mrb_str_upto(mrb_state *mrb, mrb_value beg) bi++; } - mrb_free(mrb, buf); return beg; } /* normal case */ |