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

avoid copying when the original string comes with MRB_STR_NOFREE

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-12-25 10:30:48 +09:00
parent 9b7b18aaf4
commit 673d9183cf
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/state.c
+13 -6
View File
@@ -136,7 +136,9 @@ mrb_irep_free(mrb_state *mrb, mrb_irep *irep)
mrb_free(mrb, irep->iseq);
for (i=0; i<irep->plen; i++) {
if (mrb_type(irep->pool[i]) == MRB_TT_STRING) {
mrb_free(mrb, mrb_str_ptr(irep->pool[i])->ptr);
if (mrb_str_ptr(irep->pool[i])->flags & MRB_STR_NOFREE == 0) {
mrb_free(mrb, mrb_str_ptr(irep->pool[i])->ptr);
}
mrb_free(mrb, mrb_obj_ptr(irep->pool[i]));
}
#ifdef MRB_WORD_BOXING
@@ -170,12 +172,17 @@ mrb_str_pool(mrb_state *mrb, mrb_value str)
len = s->len;
ns->len = len;
ns->ptr = (char *)mrb_malloc(mrb, (size_t)len+1);
if (s->ptr) {
memcpy(ns->ptr, s->ptr, len);
if (s->flags & MRB_STR_NOFREE) {
ns->ptr = s->ptr;
ns->flags = MRB_STR_NOFREE;
}
else {
ns->ptr = (char *)mrb_malloc(mrb, (size_t)len+1);
if (s->ptr) {
memcpy(ns->ptr, s->ptr, len);
}
ns->ptr[len] = '\0';
}
ns->ptr[len] = '\0';
return mrb_obj_value(ns);
}