mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* re.c: fix SEGV by Regexp.allocate.names, Match.allocate.names, etc.
* test/ruby/test_regexp.rb: add tests for above. * io.c: fix SEGV by IO.allocate.print, etc. * test/ruby/test_io.rb: add tests for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame
parent
8a5dd664e7
commit
7eb625425c
5 changed files with 94 additions and 11 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
Mon Jun 2 21:44:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* re.c: fix SEGV by Regexp.allocate.names, Match.allocate.names, etc.
|
||||
|
||||
* test/ruby/test_regexp.rb: add tests for above.
|
||||
|
||||
* io.c: fix SEGV by IO.allocate.print, etc.
|
||||
|
||||
* test/ruby/test_io.rb: add tests for above.
|
||||
|
||||
Mon Jun 2 19:17:47 2008 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* test/ruby/test_argf.rb (teardown): remove renamed temporary files.
|
||||
|
|
|
|||
1
io.c
1
io.c
|
|
@ -271,6 +271,7 @@ VALUE
|
|||
rb_io_get_write_io(VALUE io)
|
||||
{
|
||||
VALUE write_io;
|
||||
rb_io_check_initialized(RFILE(io)->fptr);
|
||||
write_io = RFILE(io)->fptr->tied_io_for_writing;
|
||||
if (write_io) {
|
||||
return write_io;
|
||||
|
|
|
|||
49
re.c
49
re.c
|
|
@ -672,6 +672,7 @@ static VALUE
|
|||
rb_reg_names(VALUE re)
|
||||
{
|
||||
VALUE ary = rb_ary_new();
|
||||
rb_reg_check(re);
|
||||
onig_foreach_name(RREGEXP(re)->ptr, reg_names_iter, (void*)ary);
|
||||
return ary;
|
||||
}
|
||||
|
|
@ -718,6 +719,7 @@ static VALUE
|
|||
rb_reg_named_captures(VALUE re)
|
||||
{
|
||||
VALUE hash = rb_hash_new();
|
||||
rb_reg_check(re);
|
||||
onig_foreach_name(RREGEXP(re)->ptr, reg_named_captures_iter, (void*)hash);
|
||||
return hash;
|
||||
}
|
||||
|
|
@ -866,6 +868,14 @@ update_char_offset(VALUE match)
|
|||
rm->char_offset_updated = 1;
|
||||
}
|
||||
|
||||
static void
|
||||
match_check(VALUE match)
|
||||
{
|
||||
if (!RMATCH(match)->regexp) {
|
||||
rb_raise(rb_eTypeError, "uninitialized Match");
|
||||
}
|
||||
}
|
||||
|
||||
/* :nodoc: */
|
||||
static VALUE
|
||||
match_init_copy(VALUE obj, VALUE orig)
|
||||
|
|
@ -913,6 +923,7 @@ match_init_copy(VALUE obj, VALUE orig)
|
|||
static VALUE
|
||||
match_regexp(VALUE match)
|
||||
{
|
||||
match_check(match);
|
||||
return RMATCH(match)->regexp;
|
||||
}
|
||||
|
||||
|
|
@ -933,6 +944,7 @@ match_regexp(VALUE match)
|
|||
static VALUE
|
||||
match_names(VALUE match)
|
||||
{
|
||||
match_check(match);
|
||||
return rb_reg_names(RMATCH(match)->regexp);
|
||||
}
|
||||
|
||||
|
|
@ -951,6 +963,7 @@ match_names(VALUE match)
|
|||
static VALUE
|
||||
match_size(VALUE match)
|
||||
{
|
||||
match_check(match);
|
||||
return INT2FIX(RMATCH_REGS(match)->num_regs);
|
||||
}
|
||||
|
||||
|
|
@ -963,6 +976,7 @@ match_backref_number(VALUE match, VALUE backref)
|
|||
struct re_registers *regs = RMATCH_REGS(match);
|
||||
VALUE regexp = RMATCH(match)->regexp;
|
||||
|
||||
match_check(match);
|
||||
switch(TYPE(backref)) {
|
||||
default:
|
||||
return NUM2INT(backref);
|
||||
|
|
@ -1013,6 +1027,7 @@ match_offset(VALUE match, VALUE n)
|
|||
int i = match_backref_number(match, n);
|
||||
struct re_registers *regs = RMATCH_REGS(match);
|
||||
|
||||
match_check(match);
|
||||
if (i < 0 || regs->num_regs <= i)
|
||||
rb_raise(rb_eIndexError, "index %d out of matches", i);
|
||||
|
||||
|
|
@ -1048,6 +1063,7 @@ match_begin(VALUE match, VALUE n)
|
|||
int i = match_backref_number(match, n);
|
||||
struct re_registers *regs = RMATCH_REGS(match);
|
||||
|
||||
match_check(match);
|
||||
if (i < 0 || regs->num_regs <= i)
|
||||
rb_raise(rb_eIndexError, "index %d out of matches", i);
|
||||
|
||||
|
|
@ -1082,6 +1098,7 @@ match_end(VALUE match, VALUE n)
|
|||
int i = match_backref_number(match, n);
|
||||
struct re_registers *regs = RMATCH_REGS(match);
|
||||
|
||||
match_check(match);
|
||||
if (i < 0 || regs->num_regs <= i)
|
||||
rb_raise(rb_eIndexError, "index %d out of matches", i);
|
||||
|
||||
|
|
@ -1350,6 +1367,7 @@ rb_reg_nth_defined(int nth, VALUE match)
|
|||
{
|
||||
struct re_registers *regs;
|
||||
if (NIL_P(match)) return Qnil;
|
||||
match_check(match);
|
||||
regs = RMATCH_REGS(match);
|
||||
if (nth >= regs->num_regs) {
|
||||
return Qnil;
|
||||
|
|
@ -1370,6 +1388,7 @@ rb_reg_nth_match(int nth, VALUE match)
|
|||
struct re_registers *regs;
|
||||
|
||||
if (NIL_P(match)) return Qnil;
|
||||
match_check(match);
|
||||
regs = RMATCH_REGS(match);
|
||||
if (nth >= regs->num_regs) {
|
||||
return Qnil;
|
||||
|
|
@ -1412,6 +1431,7 @@ rb_reg_match_pre(VALUE match)
|
|||
struct re_registers *regs;
|
||||
|
||||
if (NIL_P(match)) return Qnil;
|
||||
match_check(match);
|
||||
regs = RMATCH_REGS(match);
|
||||
if (BEG(0) == -1) return Qnil;
|
||||
str = rb_str_subseq(RMATCH(match)->str, 0, BEG(0));
|
||||
|
|
@ -1439,6 +1459,7 @@ rb_reg_match_post(VALUE match)
|
|||
struct re_registers *regs;
|
||||
|
||||
if (NIL_P(match)) return Qnil;
|
||||
match_check(match);
|
||||
regs = RMATCH_REGS(match);
|
||||
if (BEG(0) == -1) return Qnil;
|
||||
str = RMATCH(match)->str;
|
||||
|
|
@ -1455,6 +1476,7 @@ rb_reg_match_last(VALUE match)
|
|||
struct re_registers *regs;
|
||||
|
||||
if (NIL_P(match)) return Qnil;
|
||||
match_check(match);
|
||||
regs = RMATCH_REGS(match);
|
||||
if (BEG(0) == -1) return Qnil;
|
||||
|
||||
|
|
@ -1497,6 +1519,7 @@ match_array(VALUE match, int start)
|
|||
int i;
|
||||
int taint = OBJ_TAINTED(match);
|
||||
|
||||
match_check(match);
|
||||
for (i=start; i<regs->num_regs; i++) {
|
||||
if (regs->beg[i] == -1) {
|
||||
rb_ary_push(ary, Qnil);
|
||||
|
|
@ -1565,18 +1588,18 @@ match_captures(VALUE match)
|
|||
static int
|
||||
name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end)
|
||||
{
|
||||
int num;
|
||||
int num;
|
||||
|
||||
num = onig_name_to_backref_number(RREGEXP(regexp)->ptr,
|
||||
(const unsigned char* )name, (const unsigned char* )name_end, regs);
|
||||
if (num >= 1) {
|
||||
return num;
|
||||
}
|
||||
else {
|
||||
VALUE s = rb_str_new(name, (long )(name_end - name));
|
||||
rb_raise(rb_eIndexError, "undefined group name reference: %s",
|
||||
StringValuePtr(s));
|
||||
}
|
||||
num = onig_name_to_backref_number(RREGEXP(regexp)->ptr,
|
||||
(const unsigned char* )name, (const unsigned char* )name_end, regs);
|
||||
if (num >= 1) {
|
||||
return num;
|
||||
}
|
||||
else {
|
||||
VALUE s = rb_str_new(name, (long )(name_end - name));
|
||||
rb_raise(rb_eIndexError, "undefined group name reference: %s",
|
||||
StringValuePtr(s));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1610,6 +1633,7 @@ match_aref(int argc, VALUE *argv, VALUE match)
|
|||
{
|
||||
VALUE idx, rest;
|
||||
|
||||
match_check(match);
|
||||
rb_scan_args(argc, argv, "11", &idx, &rest);
|
||||
|
||||
if (NIL_P(rest)) {
|
||||
|
|
@ -1669,6 +1693,7 @@ static VALUE
|
|||
match_values_at(int argc, VALUE *argv, VALUE match)
|
||||
{
|
||||
struct re_registers *regs = RMATCH_REGS(match);
|
||||
match_check(match);
|
||||
return rb_get_values_at(match, regs->num_regs, argc, argv, match_entry);
|
||||
}
|
||||
|
||||
|
|
@ -1688,6 +1713,7 @@ match_to_s(VALUE match)
|
|||
{
|
||||
VALUE str = rb_reg_last_match(match);
|
||||
|
||||
match_check(match);
|
||||
if (NIL_P(str)) str = rb_str_new(0,0);
|
||||
if (OBJ_TAINTED(match)) OBJ_TAINT(str);
|
||||
if (OBJ_TAINTED(RMATCH(match)->str)) OBJ_TAINT(str);
|
||||
|
|
@ -1708,6 +1734,7 @@ match_to_s(VALUE match)
|
|||
static VALUE
|
||||
match_string(VALUE match)
|
||||
{
|
||||
match_check(match);
|
||||
return RMATCH(match)->str; /* str is frozen */
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1219,4 +1219,8 @@ class TestIO < Test::Unit::TestCase
|
|||
|
||||
assert_equal("bar\n", File.read(t.path, 4, 4))
|
||||
end
|
||||
|
||||
def test_uninitialized
|
||||
assert_raise(IOError) { IO.allocate.print "" }
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -676,4 +676,45 @@ class TestRegexp < Test::Unit::TestCase
|
|||
assert_equal(3, ("foo" + "bar" * 1000).rindex(/#{"bar"*1000}/))
|
||||
assert_equal(4, ("foo\nbar\nbaz\n").rindex(/bar/i))
|
||||
end
|
||||
|
||||
def test_uninitialized
|
||||
assert_raise(TypeError) { Regexp.allocate.hash }
|
||||
assert_raise(TypeError) { Regexp.allocate.eql? Regexp.allocate }
|
||||
assert_raise(TypeError) { Regexp.allocate == Regexp.allocate }
|
||||
assert_raise(TypeError) { Regexp.allocate =~ "" }
|
||||
assert_equal(false, Regexp.allocate === Regexp.allocate)
|
||||
assert_nil(~Regexp.allocate)
|
||||
assert_raise(TypeError) { Regexp.allocate.match("") }
|
||||
assert_raise(TypeError) { Regexp.allocate.to_s }
|
||||
assert_raise(TypeError) { Regexp.allocate.inspect }
|
||||
assert_raise(TypeError) { Regexp.allocate.source }
|
||||
assert_raise(TypeError) { Regexp.allocate.casefold? }
|
||||
assert_raise(TypeError) { Regexp.allocate.options }
|
||||
assert_equal(Encoding.find("ASCII-8BIT"), Regexp.allocate.encoding)
|
||||
assert_equal(false, Regexp.allocate.fixed_encoding?)
|
||||
assert_raise(TypeError) { Regexp.allocate.names }
|
||||
assert_raise(TypeError) { Regexp.allocate.named_captures }
|
||||
|
||||
assert_raise(TypeError) { MatchData.allocate.regexp }
|
||||
assert_raise(TypeError) { MatchData.allocate.names }
|
||||
assert_raise(TypeError) { MatchData.allocate.size }
|
||||
assert_raise(TypeError) { MatchData.allocate.length }
|
||||
assert_raise(TypeError) { MatchData.allocate.offset(0) }
|
||||
assert_raise(TypeError) { MatchData.allocate.begin(0) }
|
||||
assert_raise(TypeError) { MatchData.allocate.end(0) }
|
||||
assert_raise(TypeError) { MatchData.allocate.to_a }
|
||||
assert_raise(TypeError) { MatchData.allocate[:foo] }
|
||||
assert_raise(TypeError) { MatchData.allocate.captures }
|
||||
assert_raise(TypeError) { MatchData.allocate.values_at }
|
||||
assert_raise(TypeError) { MatchData.allocate.pre_match }
|
||||
assert_raise(TypeError) { MatchData.allocate.post_match }
|
||||
assert_raise(TypeError) { MatchData.allocate.to_s }
|
||||
assert_match(/^#<MatchData:.*>$/, MatchData.allocate.inspect)
|
||||
assert_raise(TypeError) { MatchData.allocate.string }
|
||||
$~ = MatchData.allocate
|
||||
assert_raise(TypeError) { $& }
|
||||
assert_raise(TypeError) { $` }
|
||||
assert_raise(TypeError) { $' }
|
||||
assert_raise(TypeError) { $+ }
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue