summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-21 09:23:28 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-21 09:23:28 +0000
commit63b6b9c43003cd5071748efca0a6d9b066834c5b (patch)
treef8118586a62a230db5e7a53998ec7c8775b78eac /re.c
parente93b8f1c892672a06bd6861859373e7bec49c3f6 (diff)
* time.c (time_plus): result should not be negative unless
NEGATIVE_TIME_T is defined. * time.c (time_new_internal): should check tv_sec overflow too. * time.c (time_timeval): should check time_t range when time is initialized from float. * time.c (time_plus): uses modf(3). * variable.c (rb_cvar_set): add frozen class/module check. * variable.c (rb_cvar_declare): add frozen class/module check. * re.c (match_to_a): should propagate taint. * re.c (rb_reg_s_quote): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/re.c b/re.c
index 176c3bc..d6f860b 100644
--- a/re.c
+++ b/re.c
@@ -781,11 +781,16 @@ match_to_a(match)
VALUE ary = rb_ary_new2(regs->num_regs);
char *ptr = RSTRING(RMATCH(match)->str)->ptr;
int i;
-
+ int taint = OBJ_TAINTED(match);
+
for (i=0; i<regs->num_regs; i++) {
- if (regs->beg[i] == -1) rb_ary_push(ary, Qnil);
- else rb_ary_push(ary, rb_str_new(ptr+regs->beg[i],
- regs->end[i]-regs->beg[i]));
+ if (regs->beg[i] == -1) {
+ rb_ary_push(ary, Qnil);
+ } else {
+ VALUE str = rb_str_new(ptr+regs->beg[i], regs->end[i]-regs->beg[i]);
+ if (taint) OBJ_TAINT(str);
+ rb_ary_push(ary, str);
+ }
}
return ary;
}
@@ -1122,7 +1127,7 @@ rb_reg_s_quote(argc, argv)
}
kcode_reset_option();
rb_str_resize(tmp, t - RSTRING(tmp)->ptr);
-
+ OBJ_INFECT(tmp, str);
return tmp;
}