diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gc.c | 1 | ||||
| -rw-r--r-- | src/load.c | 9 | ||||
| -rw-r--r-- | src/string.c | 14 |
3 files changed, 11 insertions, 13 deletions
@@ -11,6 +11,7 @@ # include <limits.h> #endif #include <string.h> +#include <stdlib.h> #include "mruby.h" #include "mruby/array.h" #include "mruby/class.h" diff --git a/src/load.c b/src/load.c index 62010e425..e832de628 100644 --- a/src/load.c +++ b/src/load.c @@ -539,7 +539,9 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp) size_t sirep; struct rite_section_header section_header; long fpos; - const size_t block_size = 1 << 14; + size_t block_size = 1 << 14; + const uint8_t block_fallback_count = 4; + int i; const size_t buf_size = sizeof(struct rite_binary_header); if ((mrb == NULL) || (fp == NULL)) { @@ -564,7 +566,10 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp) /* verify CRC */ fpos = ftell(fp); /* You don't need use SIZE_ERROR as block_size is enough small. */ - buf = mrb_malloc(mrb, block_size); + for (i = 0; i < block_fallback_count; i++,block_size >>= 1){ + buf = mrb_malloc(mrb, block_size); + if (buf) break; + } if (!buf) { return MRB_DUMP_GENERAL_FAILURE; } diff --git a/src/string.c b/src/string.c index 77f81ecc6..328266df9 100644 --- a/src/string.c +++ b/src/string.c @@ -104,10 +104,9 @@ mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len) mrb_str_modify(mrb, s); slen = s->len; if (len != slen) { - if (slen < len || slen -len > 1024) { - s->ptr = (char *)mrb_realloc(mrb, s->ptr, len+1); + if (slen < len || slen - len > 256) { + RESIZE_CAPA(s, len); } - s->aux.capa = len; s->len = len; s->ptr[len] = '\0'; /* sentinel */ } @@ -261,14 +260,7 @@ mrb_str_new_cstr(mrb_state *mrb, const char *p) len = 0; } - s = mrb_obj_alloc_string(mrb); - s->ptr = (char *)mrb_malloc(mrb, len+1); - if (p) { - memcpy(s->ptr, p, len); - } - s->ptr[len] = 0; - s->len = (mrb_int)len; - s->aux.capa = (mrb_int)len; + s = str_new(mrb, p, len); return mrb_obj_value(s); } |