1 files changed, 17 insertions, 13 deletions
diff --git a/src/codegen.c b/src/codegen.c
index c7b8e2d74..03c752826 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -475,6 +475,8 @@ new_msym(codegen_scope *s, mrb_sym sym)
 {
   size_t i, len;
 
+  mrb_assert(s->irep);
+
   len = s->irep->slen;
   if (len > 256) len = 256;
   for (i=0; i<len; i++) {
@@ -1106,21 +1108,23 @@ readint_mrb_int(codegen_scope *s, const char *p, int base, mrb_bool neg, mrb_boo
       codegen_error(s, "malformed readint input");
     }
 
-    if (neg) {
-      if ((MRB_INT_MIN + n)/base > result) {
-        *overflow = TRUE;
-        return 0;
+    if(base > 0) {
+      if (neg) {
+        if ((MRB_INT_MIN + n)/base > result) {
+          *overflow = TRUE;
+          return 0;
+        }
+        result *= base;
+        result -= n;
       }
-      result *= base;
-      result -= n;
-    }
-    else {
-      if ((MRB_INT_MAX - n)/base < result) {
-        *overflow = TRUE;
-        return 0;
+      else {
+        if ((MRB_INT_MAX - n)/base < result) {
+          *overflow = TRUE;
+          return 0;
+        }
+        result *= base;
+        result += n;
       }
-      result *= base;
-      result += n;
     }
     p++;
   }