Should not check/call `to_str` for immediate objects; ref #3515

09574922 · Yukihiro "Matz" Matsumoto · 527dcd52 · 09574922
Commit 09574922 authored Mar 19, 2017 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

src/array.c src/array.c +11 -9

No files found.
--- a/src/array.c
+++ b/src/array.c
@@ -1048,15 +1048,17 @@ join_ary(mrb_state *mrb, mrb_value ary, mrb_value sep, mrb_value list)
      break;
    default:
-      tmp = mrb_check_string_type(mrb, val);
+      if (!mrb_immediate_p(val)) {
-      if (!mrb_nil_p(tmp)) {
+        tmp = mrb_check_string_type(mrb, val);
-        val = tmp;
+        if (!mrb_nil_p(tmp)) {
-        goto str_join;
+          val = tmp;
-      }
+          goto str_join;
-      tmp = mrb_check_convert_type(mrb, val, MRB_TT_ARRAY, "Array", "to_ary");
+        }
-      if (!mrb_nil_p(tmp)) {
+        tmp = mrb_check_convert_type(mrb, val, MRB_TT_ARRAY, "Array", "to_ary");
-        val = tmp;
+        if (!mrb_nil_p(tmp)) {
-        goto ary_join;
+          val = tmp;
+          goto ary_join;
+        }
      }
      val = mrb_obj_as_string(mrb, val);
      goto str_join;