summaryrefslogtreecommitdiffhomepage
path: root/src/load.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-06-24 00:41:48 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-06-24 00:41:48 +0900
commitec9fdd5c4ca8cfc31b96048124c1925d2e20698e (patch)
tree07d2754d7a6f23bc240e38f709231168847b1e35 /src/load.c
parentb01670a3d391de3c7df868a8285e570564ea46cd (diff)
parent8cb730ae4e63a953819023a2e31265d758b9fe42 (diff)
downloadmruby-ec9fdd5c4ca8cfc31b96048124c1925d2e20698e.tar.gz
mruby-ec9fdd5c4ca8cfc31b96048124c1925d2e20698e.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/load.c')
-rw-r--r--src/load.c9
1 files changed, 7 insertions, 2 deletions
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;
}