diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-18 08:00:38 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-18 08:00:38 +0000 |
commit | 1b327a0804614af77424657003dea3e77b01d2cb (patch) | |
tree | 413bcf7b779efca9971a2bf44c804b77aa4d03f8 | |
parent | 0e30b44a099d8b6821b5502506f79333bd2cda82 (diff) |
merge revision(s) 54465: [Backport #12237]
* 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_3@54632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/coverage/coverage.c | 1 | ||||
-rw-r--r-- | thread.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Apr 18 16:56:31 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. + Mon Apr 18 16:33:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c index 0c7755bc6d..f621280ca6 100644 --- a/ext/coverage/coverage.c +++ b/ext/coverage/coverage.c @@ -32,6 +32,7 @@ rb_coverage_start(VALUE klass) return Qnil; } +/* Make coverage arrays empty so old covered files are no longer tracked. */ static int coverage_clear_result_i(st_data_t key, st_data_t val, st_data_t h) { @@ -4768,7 +4768,7 @@ update_coverage(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klas if (coverage && RBASIC(coverage)->klass == 0) { long line = rb_sourceline() - 1; long count; - if (RARRAY_AREF(coverage, line) == Qnil) { + if (line >= RARRAY_LEN(coverage)) { /* no longer tracked */ return; } count = FIX2LONG(RARRAY_AREF(coverage, line)) + 1; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-04-18" -#define RUBY_PATCHLEVEL 87 +#define RUBY_PATCHLEVEL 88 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 |