kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* marshal.c (marshal_load): should set taintness. [ruby-dev:39723]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-12-04 12:51:32 +00:00
parent 6e06327817
commit 8f591c434d
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Dec 4 21:51:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (marshal_load): should set taintness. [ruby-dev:39723]
Thu Dec 3 22:42:09 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/stringio/test_stringio.rb: use 1.8 methods for easier backport.

1
marshal.c
View file

@ -1472,6 +1472,7 @@ marshal_load(argc, argv)
arg->symbols = st_init_numtable();
arg->data = st_init_numtable();
arg->proc = 0;
arg->taint = taint;
major = r_byte(arg);
minor = r_byte(arg);

9
test/ruby/test_marshal.rb
View file

@ -99,4 +99,13 @@ class TestMarshal < Test::Unit::TestCase
GC.start
assert(true, '[ruby-dev:39425]')
end
def test_taint
x = Object.new
x.taint
s = Marshal.dump(x)
assert_equal(true, s.tainted?)
y = Marshal.load(s)
assert_equal(true, y.tainted?)
end
end

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8"
#define RUBY_RELEASE_DATE "2009-12-03"
#define RUBY_RELEASE_DATE "2009-12-04"
#define RUBY_VERSION_CODE 188
#define RUBY_RELEASE_CODE 20091203
#define RUBY_RELEASE_CODE 20091204
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 3
#define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];