Fix underlying bugs. mrb_calloc will be crashed in case "nelem == 0" or "p == NULL"

This commit is contained in:
Masaki Muranaka
2012-07-07 12:09:59 +09:00
parent 8268ba2755
commit 47407768fd
+8 -3
View File
@@ -167,10 +167,15 @@ mrb_malloc(mrb_state *mrb, size_t len)
void*
mrb_calloc(mrb_state *mrb, size_t nelem, size_t len)
{
void *p = mrb_realloc(mrb, 0, nelem*len);
void *p;
size_t size;
size = nelem * len;
p = mrb_realloc(mrb, 0, size);
if (p && size > 0)
memset(p, 0, size);
if (len > 0)
memset(p, 0, nelem*len);
return p;
}