From 0e1cd3e37c07e65053fafc61df5eb34bf3bf9003 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 20 Dec 2010 13:22:36 +0000 Subject: merges r29807 from trunk into ruby_1_9_2. -- * vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-) Coverity Scan found this bug. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- vm_insnhelper.c | 2 +- 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 + + * vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-) + Coverity Scan found this bug. + Tue Nov 16 06:39:31 2010 Nobuyoshi Nakada * 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; -- cgit v1.2.3