summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h2
-rw-r--r--vm_insnhelper.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bdc6c15c8..454db4cadd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 16 22:30:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
+ Coverity Scan found this bug.
+
Tue Nov 16 06:39:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
diff --git a/version.h b/version.h
index 6d23a88eeb..e042492c97 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 98
+#define RUBY_PATCHLEVEL 99
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 7dcb4248f1..00856d38ee 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1474,7 +1474,7 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
while ((VALUE *)cfp < th->stack + th->stack_size) {
if (cfp->dfp == dfp) {
- VALUE epc = epc = cfp->pc - cfp->iseq->iseq_encoded;
+ VALUE epc = cfp->pc - cfp->iseq->iseq_encoded;
rb_iseq_t *iseq = cfp->iseq;
int i;