summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-08-20 09:26:11 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-08-20 09:26:11 +0900
commit1251b0d5c997009d328046e037f44530167a9e4d (patch)
tree8a1a0c9b458b8996789a791c83f02976fc1b12d1 /src
parentbceaade168c8fecab960c76df5a797b5009e90be (diff)
parent5ee00453e00d69c17a8c92db56e61ec042665cb0 (diff)
downloadmruby-1251b0d5c997009d328046e037f44530167a9e4d.tar.gz
mruby-1251b0d5c997009d328046e037f44530167a9e4d.zip
Merge pull request #2542 from cubicdaiya/issues/mrb_pool_realloc_error_handlings
Fix error handling for mrb_pool_realloc().
Diffstat (limited to 'src')
-rw-r--r--src/pool.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pool.c b/src/pool.c
index 4d8c42dd1..ffddd2552 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -166,6 +166,9 @@ mrb_pool_realloc(mrb_pool *pool, void *p, size_t oldlen, size_t newlen)
page = page->next;
}
np = mrb_pool_alloc(pool, newlen);
+ if (np == NULL) {
+ return NULL;
+ }
memcpy(np, p, oldlen);
return np;
}