diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-06-12 07:36:36 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-06-12 07:36:36 +0900 |
| commit | be3e36cb0508713d651026597d7320bc9ce8337a (patch) | |
| tree | 64b1d9c5a4c1b9938abb74a67baa91a452637924 /mrbgems/mruby-string-ext/src/string.c | |
| parent | d0401dccc4ea5fe7b1769b1f9f86e7900ebde163 (diff) | |
| parent | f1e15b023655bb0c377fada2e26b8361f702d429 (diff) | |
| download | mruby-be3e36cb0508713d651026597d7320bc9ce8337a.tar.gz mruby-be3e36cb0508713d651026597d7320bc9ce8337a.zip | |
Merge pull request #2389 from ksss/str-mem-leaks
Fix memory leaks in String
Diffstat (limited to 'mrbgems/mruby-string-ext/src/string.c')
| -rw-r--r-- | mrbgems/mruby-string-ext/src/string.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 9c172081b..f04f12c4b 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -239,37 +239,6 @@ mrb_str_lines(mrb_state *mrb, mrb_value self) return result; } -/* - * call-seq: - * string.clear -> string - * - * Makes string empty. - * - * a = "abcde" - * a.clear #=> "" - */ -static mrb_value -mrb_str_clear(mrb_state *mrb, mrb_value str) -{ - struct RString *s = mrb_str_ptr(str); - - if (!RSTR_SHARED_P(s) && !RSTR_EMBED_P(s)) { - if (RSTR_NOFREE_P(s)) { - RSTR_UNSET_NOFREE_FLAG(s); - } - else { - mrb_free(mrb, s->as.heap.ptr); - } - s->as.heap.ptr = 0; - s->as.heap.len = 0; - } - RSTR_UNSET_SHARED_FLAG(s); - RSTR_SET_EMBED_FLAG(s); - RSTR_SET_EMBED_LEN(s, 0); - RSTRING_PTR(str)[0] = '\0'; - return str; -} - void mrb_mruby_string_ext_gem_init(mrb_state* mrb) { @@ -287,7 +256,6 @@ mrb_mruby_string_ext_gem_init(mrb_state* mrb) mrb_define_method(mrb, s, "oct", mrb_str_oct, MRB_ARGS_NONE()); mrb_define_method(mrb, s, "chr", mrb_str_chr, MRB_ARGS_NONE()); mrb_define_method(mrb, s, "lines", mrb_str_lines, MRB_ARGS_NONE()); - mrb_define_method(mrb, s, "clear", mrb_str_clear, MRB_ARGS_NONE()); } void |
