clear shared and nofree flags; ref #2370

b0c90141 · Yukihiro "Matz" Matsumoto · 20dc629b · b0c90141
Commit b0c90141 authored Jun 07, 2014 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

src/string.c src/string.c +10 -4

No files found.
--- a/src/string.c
+++ b/src/string.c
@@ -2537,11 +2537,17 @@ mrb_str_clear(mrb_state *mrb, mrb_value str)
 {
  struct RString *s = mrb_str_ptr(str);
-  if (!STR_SHARED_P(s) && !STR_EMBED_P(s) && ((s->flags & MRB_STR_NOFREE) == 0)) {
+  if (!STR_SHARED_P(s) && !STR_EMBED_P(s)) {
-    mrb_free(mrb, s->as.heap.ptr);
+    if (s->flags & MRB_STR_NOFREE) {
-    RSTRING(str)->as.heap.ptr = 0;
+      s->flags &= ~MRB_STR_NOFREE;
-    RSTRING(str)->as.heap.len = 0;
+    }
+    else {
+      mrb_free(mrb, s->as.heap.ptr);
+    }
+    s->as.heap.ptr = 0;
+    s->as.heap.len = 0;
  }
+  STR_UNSET_SHARED_FLAG(s);
  STR_SET_EMBED_FLAG(s);
  STR_SET_EMBED_LEN(s, 0);
  RSTRING_PTR(str)[0] = '\0';