Skip to content

Early return when nothing to be escaped. #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nobu merged 1 commit into from
Oct 3, 2026
Merged

Early return when nothing to be escaped. #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions ext/erb/escape/escape.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,31 +318,37 @@ consume_match(search_state *search)
#define find_next find_next_basic
#endif

static inline char *
append_segment(char *dest, const unsigned char *segment_start, const search_state *search)
{
size_t segment_len = search->cstr - segment_start;
if (segment_len) {
memcpy(dest, segment_start, segment_len);
dest += segment_len;
}
return dest;
}

static VALUE
optimized_escape_html(VALUE str)
{
VALUE vbuf;
char *buf = NULL;
search_state search = {
.cstr = (const unsigned char *)RSTRING_PTR(str),
};
search.end = search.cstr + RSTRING_LEN(str);

const unsigned char *segment_start = search.cstr;
char *dest = NULL;

while (find_next(&search)) {
if (!find_next(&search)) return str;

VALUE vbuf;
char *buf = ALLOCV_N(char, vbuf, escaped_length(str));
char *dest = buf;

do {
const unsigned char c = *search.cstr;

size_t segment_len = search.cstr - segment_start;
if (!buf) {
buf = ALLOCV_N(char, vbuf, escaped_length(str));
dest = buf;
}
if (segment_len) {
memcpy(dest, segment_start, segment_len);
dest += segment_len;
}
dest = append_segment(dest, segment_start, &search);

switch(c) {
#define HTML_ESCAPE(c, str) \
Expand All @@ -363,18 +369,13 @@ optimized_escape_html(VALUE str)
}
consume_match(&search);
segment_start = search.cstr;
}
} while (find_next(&search));

dest = append_segment(dest, segment_start, &search);

VALUE escaped = rb_enc_str_new(buf, dest - buf, rb_enc_get(str));
ALLOCV_END(vbuf);

VALUE escaped = str;
if (buf) {
size_t segment_len = search.cstr - segment_start;
if (segment_len) {
memcpy(dest, segment_start, segment_len);
dest += segment_len;
}
escaped = rb_enc_str_new(buf, dest - buf, rb_enc_get(str));
ALLOCV_END(vbuf);
}
return escaped;
}

Expand Down
Loading