From 4a82b9391a54ad6d99339485f1a827e29e0c4750 Mon Sep 17 00:00:00 2001
From: cremno <cremno@mail.ru>
Date: Wed, 29 Apr 2015 16:37:35 +0200
Subject: add more descriptive error message and fail earlier

---
 src/load.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/load.c b/src/load.c
index 889420ae9..9c4e777fc 100644
--- a/src/load.c
+++ b/src/load.c
@@ -14,6 +14,10 @@
 #include "mruby/debug.h"
 #include "mruby/error.h"
 
+#if SIZE_MAX < UINT32_MAX
+# error size_t must be at least 32 bits wide
+#endif
+
 #define FLAG_BYTEORDER_BIG 2
 #define FLAG_BYTEORDER_LIL 4
 #define FLAG_BYTEORDER_NATIVE 8
@@ -28,10 +32,6 @@
 # define SIZE_ERROR(x) (0)
 #endif
 
-#if UINT32_MAX > SIZE_MAX
-# error This code cannot be built on your environment.
-#endif
-
 static size_t
 skip_padding(const uint8_t *buf)
 {
-- 
cgit v1.2.3


From aaf2615ed60df6bd066aa60ac9c3aa9f021308b4 Mon Sep 17 00:00:00 2001
From: cremno <cremno@mail.ru>
Date: Wed, 29 Apr 2015 16:41:45 +0200
Subject: remove SIZE_ERROR() macro

It's only used once and in that case it isn't necessary anyway, since
size_t must be at least 32 bits wide and
the max. length of a filename is UINT16_MAX.
---
 src/load.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/load.c b/src/load.c
index 9c4e777fc..9961bca6c 100644
--- a/src/load.c
+++ b/src/load.c
@@ -26,10 +26,8 @@
 
 #if SIZE_MAX < UINT32_MAX
 # define SIZE_ERROR_MUL(x, y) ((x) > SIZE_MAX / (y))
-# define SIZE_ERROR(x) ((x) > SIZE_MAX)
 #else
 # define SIZE_ERROR_MUL(x, y) (0)
-# define SIZE_ERROR(x) (0)
 #endif
 
 static size_t
@@ -239,9 +237,6 @@ read_lineno_record_1(mrb_state *mrb, const uint8_t *bin, mrb_irep *irep, size_t
   fname_len = bin_to_uint16(bin);
   bin += sizeof(uint16_t);
   *len += sizeof(uint16_t);
-  if (SIZE_ERROR(fname_len + 1)) {
-    return MRB_DUMP_GENERAL_FAILURE;
-  }
   fname = (char *)mrb_malloc(mrb, fname_len + 1);
   memcpy(fname, bin, fname_len);
   fname[fname_len] = '\0';
@@ -667,7 +662,6 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp)
     return NULL;
   }
 
-  /* 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);
-- 
cgit v1.2.3


From c579ab1c8bc07102a08a12b7e8f1ab5f0e8b0323 Mon Sep 17 00:00:00 2001
From: cremno <cremno@mail.ru>
Date: Wed, 29 Apr 2015 17:00:35 +0200
Subject: always define SIZE_ERROR_MUL() macro

Previously there wasn't a way to trigger the useful definition, but it
is needed and that in every case to check for integer overflow due to
multiplication and faulty/modified binary files.

Also change existing code to a calloc()-like parameter order.
---
 src/load.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/load.c b/src/load.c
index 9961bca6c..93b9efcd4 100644
--- a/src/load.c
+++ b/src/load.c
@@ -24,11 +24,7 @@
 #define FLAG_SRC_MALLOC 1
 #define FLAG_SRC_STATIC 0
 
-#if SIZE_MAX < UINT32_MAX
-# define SIZE_ERROR_MUL(x, y) ((x) > SIZE_MAX / (y))
-#else
-# define SIZE_ERROR_MUL(x, y) (0)
-#endif
+#define SIZE_ERROR_MUL(nmemb, size) ((nmemb) > SIZE_MAX / (size))
 
 static size_t
 skip_padding(const uint8_t *buf)
@@ -77,7 +73,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag
   src += skip_padding(src);
 
   if (irep->ilen > 0) {
-    if (SIZE_ERROR_MUL(sizeof(mrb_code), irep->ilen)) {
+    if (SIZE_ERROR_MUL(irep->ilen, sizeof(mrb_code))) {
       return NULL;
     }
     if ((flags & FLAG_SRC_MALLOC) == 0 &&
@@ -111,7 +107,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag
   plen = (size_t)bin_to_uint32(src); /* number of pool */
   src += sizeof(uint32_t);
   if (plen > 0) {
-    if (SIZE_ERROR_MUL(sizeof(mrb_value), plen)) {
+    if (SIZE_ERROR_MUL(plen, sizeof(mrb_value))) {
       return NULL;
     }
     irep->pool = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * plen);
@@ -156,7 +152,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag
   irep->slen = (size_t)bin_to_uint32(src);  /* syms length */
   src += sizeof(uint32_t);
   if (irep->slen > 0) {
-    if (SIZE_ERROR_MUL(sizeof(mrb_sym), irep->slen)) {
+    if (SIZE_ERROR_MUL(irep->slen, sizeof(mrb_sym))) {
       return NULL;
     }
     irep->syms = (mrb_sym *)mrb_malloc(mrb, sizeof(mrb_sym) * irep->slen);
-- 
cgit v1.2.3