summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-09 01:02:58 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-09 01:02:58 +0000
commitc182d50eb8445f188f4c3e93b6922e1d7da12edf (patch)
tree38c789d33b7c5e3a3c86d6c58c183361033bc1a2
parentc2bd2760616f13047fd42ae9b9645efb2c072076 (diff)
merge revision(s) 21997:
* re.c (match_check): check if MatchData is initialized. [ruby-core:18749] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--re.c40
-rw-r--r--version.h2
3 files changed, 40 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d158c9e..7341e94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 9 10:02:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (match_check): check if MatchData is initialized.
+ [ruby-core:18749]
+
Mon Mar 9 09:56:34 2009 Shugo Maeda <shugo@ruby-lang.org>
* lib/rexml/rexml.rb: incremented Ruby::VERSION. Thanks, Jeremy
diff --git a/re.c b/re.c
index a0ac6a8..f2ac99f 100644
--- a/re.c
+++ b/re.c
@@ -682,6 +682,14 @@ match_alloc(klass)
return (VALUE)match;
}
+static void
+match_check(VALUE match)
+{
+ if (!RMATCH(match)->str) {
+ rb_raise(rb_eTypeError, "uninitialized Match");
+ }
+}
+
/* :nodoc: */
static VALUE
match_init_copy(obj, orig)
@@ -717,6 +725,7 @@ static VALUE
match_size(match)
VALUE match;
{
+ match_check(match);
return INT2FIX(RMATCH(match)->regs->num_regs);
}
@@ -739,6 +748,7 @@ match_offset(match, n)
{
int i = NUM2INT(n);
+ match_check(match);
if (i < 0 || RMATCH(match)->regs->num_regs <= i)
rb_raise(rb_eIndexError, "index %d out of matches", i);
@@ -768,6 +778,7 @@ match_begin(match, n)
{
int i = NUM2INT(n);
+ match_check(match);
if (i < 0 || RMATCH(match)->regs->num_regs <= i)
rb_raise(rb_eIndexError, "index %d out of matches", i);
@@ -796,6 +807,7 @@ match_end(match, n)
{
int i = NUM2INT(n);
+ match_check(match);
if (i < 0 || RMATCH(match)->regs->num_regs <= i)
rb_raise(rb_eIndexError, "index %d out of matches", i);
@@ -959,6 +971,7 @@ rb_reg_nth_defined(nth, match)
VALUE match;
{
if (NIL_P(match)) return Qnil;
+ match_check(match);
if (nth >= RMATCH(match)->regs->num_regs) {
return Qnil;
}
@@ -979,6 +992,7 @@ rb_reg_nth_match(nth, match)
long start, end, len;
if (NIL_P(match)) return Qnil;
+ match_check(match);
if (nth >= RMATCH(match)->regs->num_regs) {
return Qnil;
}
@@ -1021,6 +1035,7 @@ rb_reg_match_pre(match)
VALUE str;
if (NIL_P(match)) return Qnil;
+ match_check(match);
if (RMATCH(match)->BEG(0) == -1) return Qnil;
str = rb_str_substr(RMATCH(match)->str, 0, RMATCH(match)->BEG(0));
if (OBJ_TAINTED(match)) OBJ_TAINT(str);
@@ -1047,6 +1062,7 @@ rb_reg_match_post(match)
long pos;
if (NIL_P(match)) return Qnil;
+ match_check(match);
if (RMATCH(match)->BEG(0) == -1) return Qnil;
str = RMATCH(match)->str;
pos = RMATCH(match)->END(0);
@@ -1062,6 +1078,7 @@ rb_reg_match_last(match)
int i;
if (NIL_P(match)) return Qnil;
+ match_check(match);
if (RMATCH(match)->BEG(0) == -1) return Qnil;
for (i=RMATCH(match)->regs->num_regs-1; RMATCH(match)->BEG(i) == -1 && i > 0; i--)
@@ -1099,12 +1116,17 @@ match_array(match, start)
VALUE match;
int start;
{
- struct re_registers *regs = RMATCH(match)->regs;
- VALUE ary = rb_ary_new2(regs->num_regs);
- VALUE target = RMATCH(match)->str;
+ struct re_registers *regs;
+ VALUE ary;
+ VALUE target;
int i;
int taint = OBJ_TAINTED(match);
-
+
+ match_check(match);
+ regs = RMATCH(match)->regs;
+ ary = rb_ary_new2(regs->num_regs);
+ target = RMATCH(match)->str;
+
for (i=start; i<regs->num_regs; i++) {
if (regs->beg[i] == -1) {
rb_ary_push(ary, Qnil);
@@ -1236,6 +1258,7 @@ match_values_at(argc, argv, match)
VALUE *argv;
VALUE match;
{
+ match_check(match);
return rb_values_at(match, RMATCH(match)->regs->num_regs, argc, argv, match_entry);
}
@@ -1261,12 +1284,16 @@ match_select(argc, argv, match)
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
}
else {
- struct re_registers *regs = RMATCH(match)->regs;
- VALUE target = RMATCH(match)->str;
+ struct re_registers *regs;
+ VALUE target;
VALUE result = rb_ary_new();
int i;
int taint = OBJ_TAINTED(match);
+ match_check(match);
+ regs = RMATCH(match)->regs;
+ target = RMATCH(match)->str;
+
for (i=0; i<regs->num_regs; i++) {
VALUE str = rb_str_substr(target, regs->beg[i], regs->end[i]-regs->beg[i]);
if (taint) OBJ_TAINT(str);
@@ -1317,6 +1344,7 @@ static VALUE
match_string(match)
VALUE match;
{
+ match_check(match);
return RMATCH(match)->str; /* str is frozen */
}
diff --git a/version.h b/version.h
index 1114b53..fb59646 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-03-09"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090309
-#define RUBY_PATCHLEVEL 148
+#define RUBY_PATCHLEVEL 149
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8