diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 13:22:36 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 13:22:36 +0000 |
| commit | 0e1cd3e37c07e65053fafc61df5eb34bf3bf9003 (patch) | |
| tree | 7aaf44c88f13a0efb0d6a63d5a59fd516220c672 | |
| parent | 139ab718de87af8ca9a3c83da9ca4f59c9cdb7e8 (diff) | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -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 @@ -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; |