summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-03 01:24:09 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-03 01:24:09 +0000
commit0e32c7c10abb1080c88af76574bcc2aa25c78cd5 (patch)
treedefcf5a858f08857f5dbe88117e0fbb95b7f63c5 /ext
parent9b6dec6cac17a507792add61247772ac76d23f48 (diff)
Revert "ext/cgi/escape: preserve String subclass in result"
This reverts commit 6afea14043b0c0e603f26c89ae0d043f65852668 r63328 I misread the original bug report and got results flipped. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/cgi/escape/escape.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c
index a36770b..ced1b18 100644
--- a/ext/cgi/escape/escape.c
+++ b/ext/cgi/escape/escape.c
@@ -59,7 +59,7 @@ optimized_escape_html(VALUE str)
case '<':
case '>':
if (!dest) {
- dest = rb_str_new_with_class(str, 0, 0);
+ dest = rb_str_buf_new(len);
}
rb_str_cat(dest, cstr + beg, i - beg);
@@ -151,7 +151,7 @@ optimized_unescape_html(VALUE str)
i += clen;
if (overflow || cc >= charlimit || cstr[i] != ';') continue;
if (!dest) {
- dest = rb_str_new_with_class(str, 0, 0);
+ dest = rb_str_buf_new(len);
}
rb_str_cat(dest, cstr + beg, plen);
if (charlimit > 256) {
@@ -168,7 +168,7 @@ optimized_unescape_html(VALUE str)
continue;
}
if (!dest) {
- dest = rb_str_new_with_class(str, 0, 0);
+ dest = rb_str_buf_new(len);
}
rb_str_cat(dest, cstr + beg, plen);
rb_str_cat(dest, &c, 1);
@@ -219,7 +219,7 @@ optimized_escape(VALUE str)
const unsigned char c = (unsigned char)cstr[i];
if (!url_unreserved_char(c)) {
if (!dest) {
- dest = rb_str_new_with_class(str, 0, 0);
+ dest = rb_str_buf_new(len);
}
rb_str_cat(dest, cstr + beg, i - beg);
@@ -278,7 +278,7 @@ optimized_unescape(VALUE str, VALUE encoding)
}
if (!dest) {
- dest = rb_str_new_with_class(str, 0, 0);
+ dest = rb_str_buf_new(len);
}
rb_str_cat(dest, cstr + beg, i - beg);