Skip to content

gh-97556: Fix crash on null characters in string literal parser #97577

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
apccurtiss wants to merge 6 commits into
base: main
Choose a base branch
from
+15 −8
Open

gh-97556: Fix crash on null characters in string literal parser #97577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ae662c
String parser no longer crashes on null characters
apccurtiss Sep 26, 2022
fd4161d
Removed test, which is blocked by issue #96670
apccurtiss Sep 26, 2022
a54e0ff
Merge branch 'main' into fix-issue-97556
apccurtiss Sep 26, 2022
c48ec29
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 26, 2022
b704f7e
Moved the INT_MAX length check to the top of the string parser.
apccurtiss Sep 26, 2022
5c9dd40
Merge branch 'fix-issue-97556' of https://github.com/apccurtiss/cpyth…
apccurtiss Sep 26, 2022
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-09-26-16-46-54.gh-issue-96670.-n9hqb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix interpreter crash when a string literal contains a null character.

@pablogsal pablogsal Jun 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: this NEWS entry is filed under gh-issue-96670, but this PR fixes gh-97556. Can we rename it so the changelog points to the right issue?

22 changes: 14 additions & 8 deletions Parser/string_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,18 @@ int
_PyPegen_parsestr(Parser *p, int *bytesmode, int *rawmode, PyObject **result,
const char **fstr, Py_ssize_t *fstrlen, Token *t)
{
const char *s = PyBytes_AsString(t->bytes);
if (s == NULL) {
char *s;
Py_ssize_t len;

if (PyBytes_AsStringAndSize(t->bytes, &s, &len)) {

@pablogsal pablogsal Jun 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we reject this in the tokenizer instead? Otherwise files with NUL bytes in a string literal become valid source, while compile() still rejects NUL bytes.

@pablogsal pablogsal Jun 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a crash fix but it lands without a regression test. I know a .py file with a null byte is blocked by gh-96670, but can we still add a regression test somehow, e.g. compiling a bytes source with an embedded null? We really want to keep this from regressing.

return -1;
}

if (len > INT_MAX) {
PyErr_SetString(PyExc_OverflowError, "string to parse is too long");
return -1;
}

size_t len;
int quote = Py_CHARMASK(*s);
int fmode = 0;
*bytesmode = 0;
Expand All @@ -184,17 +190,21 @@ _PyPegen_parsestr(Parser *p, int *bytesmode, int *rawmode, PyObject **result,
while (!*bytesmode || !*rawmode) {
if (quote == 'b' || quote == 'B') {
quote =(unsigned char)*++s;
len--;
*bytesmode = 1;
}
else if (quote == 'u' || quote == 'U') {
quote = (unsigned char)*++s;
len--;
}
else if (quote == 'r' || quote == 'R') {
quote = (unsigned char)*++s;
len--;
*rawmode = 1;
}
else if (quote == 'f' || quote == 'F') {
quote = (unsigned char)*++s;
len--;
fmode = 1;
}
else {
Expand All @@ -220,11 +230,7 @@ _PyPegen_parsestr(Parser *p, int *bytesmode, int *rawmode, PyObject **result,
}
/* Skip the leading quote char. */
s++;
len = strlen(s);
if (len > INT_MAX) {
PyErr_SetString(PyExc_OverflowError, "string to parse is too long");
return -1;
}
len--;
if (s[--len] != quote) {
/* Last quote char must match the first. */
PyErr_BadInternalCall();
Expand Down