Commit 1fefa046 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #2774 from cremno/refactor-mrb_read_irep_file

mrb_read_irep_file(): unify error handling / fix uint underflow
parents 41e69319 091ce867
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment