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

str_buf_cat(): better size check added; ref #3342

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2016-12-31 23:33:34 +09:00
parent 342b1de65c
commit 1ed4de58d0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+9 -4
View File
@@ -163,15 +163,20 @@ str_buf_cat(mrb_state *mrb, struct RString *s, const char *ptr, size_t len)
total = RSTR_LEN(s)+len;
if (total >= MRB_INT_MAX) {
size_error:
mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
}
if (capa <= total) {
while (total > capa) {
if (capa + 1 >= MRB_INT_MAX / 2) {
capa = MRB_INT_MAX;
break;
if (capa <= MRB_INT_MAX / 2) {
capa *= 2;
}
capa = (capa + 1) * 2;
else {
goto size_error;
}
}
if (capa < total || capa > MRB_INT_MAX) {
goto size_error;
}
resize_capa(mrb, s, capa);
}