Skip to content

init: fix unescape_string not advancing past escape characters #669

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

Draft
nikromen wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −1
Draft

init: fix unescape_string not advancing past escape characters #669

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
5 changes: 4 additions & 1 deletion init/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,8 @@ static void unescape_string(char *string, int len)
const char *unescaped = "?";
char utf8Buf[5];
unsigned int codepoint = 0;
hexToDigit(&codepoint, val++);
/* skip 'u', point at first hex digit */
hexToDigit(&codepoint, ++val);
val += 3;
/* check if this is a surrogate */
if ((codepoint & 0xFC00) == 0xD800) {
Expand All @@ -692,9 +693,11 @@ static void unescape_string(char *string, int len)
continue;
}
memcpy(&string[i], unescaped, (unsigned int)strlen(unescaped));
i += strlen(unescaped);
break;
}
}
val++;
}
string[i] = '\0';
}
Expand Down