diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-09 17:24:53 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-09 17:24:53 +0000 |
commit | bc50de4bd586e8ca7475c1d2e0172569e44e4f86 (patch) | |
tree | dbb34d02f9774cbce1b8796d4e1806551b12f7a7 | |
parent | e57a10903cf20fdfcd099cb24bf3db894532926a (diff) |
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
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | gc.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu Jul 9 11:22:00 2009 Kirk Haines <khaines@ruby-lang.org> + + * 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 <khaines@ruby-lang.org> * lib/soap/mimemessage.rb: Fixed a typo -- conent -> content @@ -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; @@ -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 |