summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/date/date_core.c2
-rw-r--r--iseq.c2
-rw-r--r--version.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index e4ecadf700..2c72143168 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -2381,7 +2381,7 @@ offset_to_sec(VALUE vof, int *rof)
n = FIX2LONG(vs);
if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
return 0;
- *rof = n;
+ *rof = (int)n;
return 1;
}
}
diff --git a/iseq.c b/iseq.c
index 639f1ce504..73806630b5 100644
--- a/iseq.c
+++ b/iseq.c
@@ -1313,7 +1313,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
}
rb_ary_push(body, ary);
- pos += RARRAY_LEN(ary);
+ pos += RARRAY_LENINT(ary); /* reject too huge data */
}
st_free_table(labels_table);
diff --git a/version.h b/version.h
index 27a28626a0..b8a4f8c820 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 134
+#define RUBY_PATCHLEVEL 135
#define RUBY_RELEASE_DATE "2012-02-21"
#define RUBY_RELEASE_YEAR 2012