Merge pull request #3364 from ksss/string2

Check overflow string length

Merge pull request #3364 from ksss/string2
Check overflow string length
000a3119 · Yukihiro "Matz" Matsumoto · GitHub · ede04d68 · c626b823 · 000a3119
Commit 000a3119 authored Dec 25, 2016 by Yukihiro "Matz" Matsumoto Committed by GitHub Dec 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

src/string.c src/string.c +3 -0

No files found.
--- a/src/string.c
+++ b/src/string.c
@@ -759,6 +759,9 @@ mrb_str_concat(mrb_state *mrb, mrb_value self, mrb_value other)
  }
  len = RSTR_LEN(s1) + RSTR_LEN(s2);

+  if (len < 0 || len >= MRB_INT_MAX) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
+  }
  if (RSTRING_CAPA(self) < len) {
    resize_capa(mrb, s1, len);
  }