diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-08-27 23:48:06 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-08-27 23:48:06 +0900 |
| commit | 0d400477933f09f1017db5a87bd14ff4d9348cff (patch) | |
| tree | 8e55b2b0312274c9a6977a6576ae65ad1c0b297d | |
| parent | ecda19f4024cd853d933b059ba9f082a42837096 (diff) | |
| parent | cc22ec85b9f1b6bf818fd8d456cc12e1460164c0 (diff) | |
| download | mruby-0d400477933f09f1017db5a87bd14ff4d9348cff.tar.gz mruby-0d400477933f09f1017db5a87bd14ff4d9348cff.zip | |
Merge pull request #2566 from cubicdaiya/issues/null_check
Remove discareded NULL checks and use mrb_malloc() instead of mrb_realloc().
| -rw-r--r-- | src/dump.c | 3 | ||||
| -rw-r--r-- | src/gc.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/dump.c b/src/dump.c index e019baa99..e67eabbc8 100644 --- a/src/dump.c +++ b/src/dump.c @@ -889,9 +889,6 @@ mrb_dump_irep(mrb_state *mrb, mrb_irep *irep, int debug_info, uint8_t **bin, siz section_irep_size + section_lineno_size + section_lv_size + sizeof(struct rite_binary_footer); cur = *bin = (uint8_t*)mrb_malloc(mrb, *bin_size); - if (cur == NULL) { - goto error_exit; - } cur += sizeof(struct rite_binary_header); result = write_section_irep(mrb, irep, cur); @@ -227,11 +227,9 @@ mrb_calloc(mrb_state *mrb, size_t nelem, size_t len) nelem <= SIZE_MAX / len) { size_t size; size = nelem * len; - p = mrb_realloc(mrb, 0, size); + p = mrb_malloc(mrb, size); - if (p) { - memset(p, 0, size); - } + memset(p, 0, size); } else { p = NULL; |
