From f2636ad40bd171a08eb69c53cefd9835d07f3bd8 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 11 May 2011 21:23:40 +0000 Subject: merges a part of r30840 from trunk into ruby_1_9_2. -- * gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free. [ruby-core:35192] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ gc.h | 2 +- version.h | 2 +- vm.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa6537b1c9..ba6e2dc4a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Feb 11 19:45:26 2011 Nobuyoshi Nakada + + * eval.c (ruby_cleanup): use rb_ary_free to free internal object. + + * gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free. + [ruby-core:35192] + Fri Feb 11 16:57:03 2011 Nobuyoshi Nakada * test/ruby/test_transcode.rb (test_from_cp50221): fix wrong diff --git a/gc.h b/gc.h index 1b112f8459..d77495aa1d 100644 --- a/gc.h +++ b/gc.h @@ -58,7 +58,7 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr) #endif #define RUBY_MARK_UNLESS_NULL(ptr) if(RTEST(ptr)){rb_gc_mark(ptr);} -#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);} +#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);(ptr)=NULL;} #if STACK_GROW_DIRECTION > 0 # define STACK_UPPER(x, a, b) a diff --git a/version.h b/version.h index 846d46b6a8..4a38058803 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 198 +#define RUBY_PATCHLEVEL 199 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/vm.c b/vm.c index f7dbb178e2..01231f7235 100644 --- a/vm.c +++ b/vm.c @@ -221,7 +221,7 @@ env_free(void * const ptr) { RUBY_FREE_ENTER("env"); if (ptr) { - const rb_env_t * const env = ptr; + rb_env_t *const env = ptr; RUBY_FREE_UNLESS_NULL(env->env); ruby_xfree(ptr); } -- cgit v1.2.3