archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 13:34:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 54465: [Backport #12237]

Browse source 
* thread.c (update_coverage): Do not track coverage in loaded files
	  after Coverage.result. Avoids out-of-bounds access. [Bug #12237]

	* ext/coverage/coverage.c (coverage_clear_result_i): document.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-04-22 06:09:28 +00:00
parent 658cd0871e
commit aef285f5df
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Apr 22 15:08:27 2016 Benoit Daloze <eregontp@gmail.com>
* thread.c (update_coverage): Do not track coverage in loaded files
after Coverage.result. Avoids out-of-bounds access. [Bug #12237]
* ext/coverage/coverage.c (coverage_clear_result_i): document.
Fri Apr 22 14:56:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Apr 22 14:56:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc * ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc

1
ext/coverage/coverage.c
View file

@ -32,6 +32,7 @@ rb_coverage_start(VALUE klass)
return Qnil; return Qnil;
} }
/* Make coverage arrays empty so old covered files are no longer tracked. */
static int static int
coverage_result_i(st_data_t key, st_data_t val, st_data_t h) coverage_result_i(st_data_t key, st_data_t val, st_data_t h)
{ {

2
thread.c
View file

@ -5181,7 +5181,7 @@ update_coverage(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klas
if (coverage && RBASIC(coverage)->klass == 0) { if (coverage && RBASIC(coverage)->klass == 0) {
long line = rb_sourceline() - 1; long line = rb_sourceline() - 1;
long count; long count;
if (RARRAY_AREF(coverage, line) == Qnil) { if (line >= RARRAY_LEN(coverage)) { /* no longer tracked */
return; return;
} }
count = FIX2LONG(RARRAY_AREF(coverage, line)) + 1; count = FIX2LONG(RARRAY_AREF(coverage, line)) + 1;

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.5" #define RUBY_VERSION "2.2.5"
#define RUBY_RELEASE_DATE "2016-04-22" #define RUBY_RELEASE_DATE "2016-04-22"
#define RUBY_PATCHLEVEL 299 #define RUBY_PATCHLEVEL 300
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4