Skip to content

Match Ruby escape parsing semantics #3126

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

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −6
Open

Match Ruby escape parsing semantics #3126

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
15 changes: 9 additions & 6 deletions src/util/rbs_unescape.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ static const struct {
static int hex_to_int(const char *hex, int length) {
int result = 0;
for (int i = 0; i < length; i++) {
result = result * 16 + (isdigit(hex[i]) ? hex[i] - '0' : tolower(hex[i]) - 'a' + 10);
unsigned char digit = (unsigned char) hex[i];
result = result * 16 + (isdigit(digit) ? digit - '0' : tolower(digit) - 'a' + 10);
}
return result;
}
Expand Down Expand Up @@ -88,17 +89,17 @@ rbs_string_t unescape_string(rbs_allocator_t *allocator, const rbs_string_t stri
while (i < len) {
if (input[i] == '\\' && i + 1 < len) {
if (is_double_quote) {
if (isdigit(input[i + 1])) {
if (input[i + 1] >= '0' && input[i + 1] <= '7') {
// Octal escape
int octal_len = 1;
while (octal_len < 3 && i + 1 + octal_len < len && isdigit(input[i + 1 + octal_len]))
while (octal_len < 3 && i + 1 + octal_len < len && input[i + 1 + octal_len] >= '0' && input[i + 1 + octal_len] <= '7')
octal_len++;
int value = octal_to_int(input + i + 1, octal_len);
output[j++] = (char) value;
i += octal_len + 1;
} else if (input[i + 1] == 'x' && i + 3 < len) {
} else if (input[i + 1] == 'x' && i + 2 < len) {
// Hex escape
int hex_len = isxdigit(input[i + 3]) ? 2 : 1;
int hex_len = i + 3 < len && isxdigit((unsigned char) input[i + 3]) ? 2 : 1;
int value = hex_to_int(input + i + 2, hex_len);
output[j++] = (char) value;
i += hex_len + 2;
Expand All @@ -124,7 +125,9 @@ rbs_string_t unescape_string(rbs_allocator_t *allocator, const rbs_string_t stri
int found = 0;
for (size_t k = 0; k < sizeof(TABLE) / sizeof(TABLE[0]); k++) {
if (strncmp(input + i, TABLE[k].from, strlen(TABLE[k].from)) == 0) {
output[j++] = TABLE[k].to[0];
size_t replacement_length = strlen(TABLE[k].to);
memcpy(output + j, TABLE[k].to, replacement_length);
j += replacement_length;
i += strlen(TABLE[k].from);
found = 1;
break;
Expand Down
Loading