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

Merge pull request #2774 from cremno/refactor-mrb_read_irep_file

Browse Source 
mrb_read_irep_file(): unify error handling / fix uint underflow
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-04-30 12:16:21 +09:00
parent 41e6931987 091ce867c1
commit 1fefa046cd
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/load.c
+6 -8
View File
@@ -670,23 +670,21 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp)
/* You don't need use SIZE_ERROR as buf_size is enough small. */
buf = (uint8_t*)mrb_malloc(mrb, header_size);
if (fread(buf, header_size, 1, fp) == 0) {
mrb_free(mrb, buf);
return NULL;
goto irep_exit;
}
result = read_binary_header(buf, &buf_size, NULL, &flags);
if (result != MRB_DUMP_OK) {
mrb_free(mrb, buf);
return NULL;
if (result != MRB_DUMP_OK || buf_size <= header_size) {
goto irep_exit;
}
buf = (uint8_t*)mrb_realloc(mrb, buf, buf_size);
if (fread(buf+header_size, buf_size-header_size, 1, fp) == 0) {
mrb_free(mrb, buf);
return NULL;
goto irep_exit;
}
irep = read_irep(mrb, buf, FLAG_SRC_MALLOC);
mrb_free(mrb, buf);
irep_exit:
mrb_free(mrb, buf);
return irep;
}