summaryrefslogtreecommitdiffhomepage
path: root/src/load.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-06-21 15:56:49 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2013-06-21 15:56:49 -0700
commit8cb730ae4e63a953819023a2e31265d758b9fe42 (patch)
tree86d9a57bc44974d111dabb5e46d4f3e89ffe026d /src/load.c
parent31b3e3cfecdb0db180d5d309eac13c5d1a2c9120 (diff)
parent31fbfb51dbcb18f4f8893aa03195ba050a722a29 (diff)
downloadmruby-8cb730ae4e63a953819023a2e31265d758b9fe42.tar.gz
mruby-8cb730ae4e63a953819023a2e31265d758b9fe42.zip
Merge pull request #1296 from kyab/fallback-for-crc-buffer
Add fallback for allocate CRC buffer
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;
}