From 9ffd060b30b85a1783d6dd81dd41ebf447e9b3e1 Mon Sep 17 00:00:00 2001 From: mame Date: Mon, 15 Nov 2010 14:57:18 +0000 Subject: * eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add size_t to a pointer typed VALUE*. Coverity Scan found this defect. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval_intern.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6e0963f941..717588978a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 15 23:54:45 2010 Yusuke Endoh + + * eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add + size_t to a pointer typed VALUE*. Coverity Scan found this defect. + Mon Nov 15 23:41:21 2010 Yusuke Endoh * compile.c (iseq_set_exception_local_table, iseq_set_local_table, diff --git a/eval_intern.h b/eval_intern.h index 549953acfc..428a2d81ff 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -172,7 +172,7 @@ enum ruby_tag_type { #define SCOPE_SET(f) (rb_vm_cref()->nd_visi = (f)) #define CHECK_STACK_OVERFLOW(cfp, margin) do \ - if (((VALUE *)(cfp)->sp) + (margin) + sizeof(rb_control_frame_t) >= ((VALUE *)cfp)) { \ + if ((VALUE *)((char *)(((VALUE *)(cfp)->sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)cfp)) { \ rb_exc_raise(sysstack_error); \ } \ while (0) -- cgit v1.2.3