From d1144220cb899b24ca949ee230606f76cd4e0b99 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Fri, 20 Apr 2012 17:18:30 +0900 Subject: move src/mdata.h to include/mruby/data.h --- src/array.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/array.c') diff --git a/src/array.c b/src/array.c index 855a45aba..69f5fd8b3 100644 --- a/src/array.c +++ b/src/array.c @@ -2,7 +2,6 @@ #include "mruby/array.h" #include #include "mruby/string.h" -#include "mdata.h" #include "mruby/class.h" #ifdef INCLUDE_REGEXP -- cgit v1.2.3 From 758096334f467dc3ac6753cb8769c9368388ed1b Mon Sep 17 00:00:00 2001 From: Patrick Hogan Date: Fri, 20 Apr 2012 09:52:10 -0500 Subject: Remove unnecessary check for size_t < 0 size_t can never be negative since it is an unsigned integer according to standard. Removed to silence warning. Signed-off-by: Patrick Hogan --- src/array.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/array.c') diff --git a/src/array.c b/src/array.c index 69f5fd8b3..e3a0a3a9a 100644 --- a/src/array.c +++ b/src/array.c @@ -35,9 +35,6 @@ mrb_ary_new_capa(mrb_state *mrb, size_t capa) { struct RArray *a; - if (capa < 0) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "negative ary size (or size too big)"); - } #ifdef LONG_MAX if (capa > ARY_MAX_SIZE) { mrb_raise(mrb, E_ARGUMENT_ERROR, "ary size too big"); -- cgit v1.2.3 From 9b3a4fd8a47c0983e3a8c3e74b649fe9d15b8cbc Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Sat, 21 Apr 2012 01:01:07 +0900 Subject: avoid integer overflow --- src/array.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/array.c') diff --git a/src/array.c b/src/array.c index e3a0a3a9a..75b2cd0c1 100644 --- a/src/array.c +++ b/src/array.c @@ -34,6 +34,7 @@ mrb_value mrb_ary_new_capa(mrb_state *mrb, size_t capa) { struct RArray *a; + size_t blen; #ifdef LONG_MAX if (capa > ARY_MAX_SIZE) { @@ -43,10 +44,14 @@ mrb_ary_new_capa(mrb_state *mrb, size_t capa) if (capa < ARY_DEFAULT_LEN) { capa = ARY_DEFAULT_LEN; } + blen = capa * sizeof(mrb_value) ; + if (blen < capa) { + mrb_raise(mrb, E_ARGUMENT_ERROR, "ary size too big"); + } a = mrb_obj_alloc(mrb, MRB_TT_ARRAY, mrb->array_class); - a->buf = mrb_malloc(mrb, sizeof(mrb_value) * capa); - memset(a->buf, 0, sizeof(mrb_value) * capa); + a->buf = mrb_malloc(mrb, blen); + memset(a->buf, 0, blen); a->capa = capa; a->len = 0; -- cgit v1.2.3