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

* marshal.c (mark_dump_arg): mark destination string. patch by

Browse source 
Vit Ondruch.  [Bug #4339]
* marshal.c (clear_dump_arg, clear_load_arg): clean up also data
  tables as same as symbols tables.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@34866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-02 01:53:11 +00:00
parent 0dea8a71c9
commit 6e7e726b8f
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Mar 2 10:53:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (mark_dump_arg): mark destination string. patch by
Vit Ondruch. [Bug #4339]
* marshal.c (clear_dump_arg, clear_load_arg): clean up also data
tables as same as symbols tables.
Wed Feb 8 14:06:59 2012 Hiroshi Nakamura <nahi@ruby-lang.org> Wed Feb 8 14:06:59 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
* ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL * ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL

3
marshal.c
View file

@ -118,6 +118,7 @@ mark_dump_arg(ptr)
if (!p->symbols) if (!p->symbols)
return; return;
rb_mark_set(p->data); rb_mark_set(p->data);
rb_gc_mark(p->str);
} }
static void static void
@ -716,6 +717,7 @@ clear_dump_arg(arg)
st_free_table(arg->symbols); st_free_table(arg->symbols);
arg->symbols = 0; arg->symbols = 0;
st_free_table(arg->data); st_free_table(arg->data);
arg->data = 0;
if (arg->taint) { if (arg->taint) {
OBJ_TAINT(arg->str); OBJ_TAINT(arg->str);
} }
@ -1428,6 +1430,7 @@ clear_load_arg(arg)
st_free_table(arg->symbols); st_free_table(arg->symbols);
arg->symbols = 0; arg->symbols = 0;
st_free_table(arg->data); st_free_table(arg->data);
arg->data = 0;
} }
/* /*

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.8" #define RUBY_VERSION "1.8.8"
#define RUBY_RELEASE_DATE "2012-02-08" #define RUBY_RELEASE_DATE "2012-03-02"
#define RUBY_VERSION_CODE 188 #define RUBY_VERSION_CODE 188
#define RUBY_RELEASE_CODE 20120208 #define RUBY_RELEASE_CODE 20120302
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 8 #define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 8 #define RUBY_RELEASE_DAY 2
#define NO_STRING_LITERAL_CONCATENATION 1 #define NO_STRING_LITERAL_CONCATENATION 1
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN