diff options
Diffstat (limited to 'ext/cgi/escape/escape.c')
| -rw-r--r-- | ext/cgi/escape/escape.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c index 6fec95af04..939b054ad2 100644 --- a/ext/cgi/escape/escape.c +++ b/ext/cgi/escape/escape.c @@ -25,6 +25,14 @@ html_escaped_cat(VALUE str, char c) } } +static inline void +preserve_original_state(VALUE orig, VALUE dest) +{ + rb_enc_associate(dest, rb_enc_get(orig)); + + FL_SET_RAW(dest, FL_TEST_RAW(orig, FL_FREEZE|FL_TAINT)); +} + static VALUE optimized_escape_html(VALUE str) { @@ -57,7 +65,7 @@ optimized_escape_html(VALUE str) if (modified) { rb_str_cat(dest, cstr + beg, len - beg); - rb_enc_associate(dest, rb_enc_get(str)); + preserve_original_state(str, dest); return dest; } else { |