archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r29800 from trunk into ruby_1_9_2.

Browse source 
--
* 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/branches/ruby_1_9_2@30255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-20 13:22:26 +00:00
parent a90f3bcb0c
commit b6e3b715dd
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Nov 15 23:54:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
* 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 <mame@tsg.ne.jp>
* compile.c (iseq_set_exception_local_table, iseq_set_local_table,

2
eval_intern.h
View file

@ -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)

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 95
#define RUBY_PATCHLEVEL 96
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1