archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 57634: [Backport #13150]

Browse source 
marshal.c: revert r57631 partially

	* marshal.c (rb_marshal_dump_limited): do not free dump_arg, which
	  may be dereferenced in check_dump_arg due to continuation, and
	  get rid of dangling pointers.

	* marshal.c (rb_marshal_load_with_proc): ditto for load_arg.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-08-09 12:17:24 +00:00
parent 8bf48ec307
commit ecc889b1c8
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Aug 9 21:16:22 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (rb_marshal_dump_limited): do not free dump_arg, which
may be dereferenced in check_dump_arg due to continuation, and
get rid of dangling pointers.
* marshal.c (rb_marshal_load_with_proc): ditto for load_arg.
Wed Aug 9 21:13:24 2017 NAKAMURA Usaku <usa@ruby-lang.org> Wed Aug 9 21:13:24 2017 NAKAMURA Usaku <usa@ruby-lang.org>
* compile.c (iseq_compile_each): remove unused definition of unused * compile.c (iseq_compile_each): remove unused definition of unused

8
marshal.c
View file

@ -1051,8 +1051,8 @@ rb_marshal_dump_limited(VALUE obj, VALUE port, int limit)
rb_io_write(arg->dest, arg->str); rb_io_write(arg->dest, arg->str);
rb_str_resize(arg->str, 0); rb_str_resize(arg->str, 0);
} }
free_dump_arg(arg); clear_dump_arg(arg);
rb_gc_force_recycle(wrapper); RB_GC_GUARD(wrapper);
return port; return port;
} }
@ -2090,8 +2090,8 @@ rb_marshal_load_with_proc(VALUE port, VALUE proc)
if (!NIL_P(proc)) arg->proc = proc; if (!NIL_P(proc)) arg->proc = proc;
v = r_object(arg); v = r_object(arg);
free_load_arg(arg); clear_load_arg(arg);
rb_gc_force_recycle(wrapper); RB_GC_GUARD(wrapper);
return v; return v;
} }

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5" #define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-08-09" #define RUBY_RELEASE_DATE "2017-08-09"
#define RUBY_PATCHLEVEL 360 #define RUBY_PATCHLEVEL 361
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8