From bc50de4bd586e8ca7475c1d2e0172569e44e4f86 Mon Sep 17 00:00:00 2001 From: wyhaines Date: Thu, 9 Jul 2009 17:24:53 +0000 Subject: Stopgap fix for gc.c based segmentation faults. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gc.c | 3 ++- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50d36af3f6..590d921929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jul 9 11:22:00 2009 Kirk Haines + + * gc.c: Add a check for DATA_PTR(obj) to run_final as a stopgap fix for debilitating segfaults. + Mon Jun 8 12:46:00 2009 Kirk Haines * lib/soap/mimemessage.rb: Fixed a typo -- conent -> content diff --git a/gc.c b/gc.c index 318e24ca73..1ed3a38ff4 100644 --- a/gc.c +++ b/gc.c @@ -1898,7 +1898,8 @@ run_final(obj) objid = rb_obj_id(obj); /* make obj into id */ rb_thread_critical = Qtrue; - if (BUILTIN_TYPE(obj) == T_DEFERRED && RDATA(obj)->dfree) { + /* NOTE: This change below, adding DATA_PTR(obj) to the if line, is a stopgap fix for segfaults; the reason for DATA_PTR(obj) == 0 needs to be found and fixed. */ + if (BUILTIN_TYPE(obj) == T_DEFERRED && RDATA(obj)->dfree && DATA_PTR(obj)) { (*RDATA(obj)->dfree)(DATA_PTR(obj)); } args[1] = 0; diff --git a/version.h b/version.h index 3a9af63472..39d28ce683 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090608 -#define RUBY_PATCHLEVEL 369 +#define RUBY_PATCHLEVEL 370 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3