Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails in the tokenizer's ``_PyTokenizer_translate_newlines`` helper, so the out-of-memory condition is propagated as a proper Python exception instead of only being recorded in ``tok->done``.
5 changes: 4 additions & 1 deletion Parser/lexer/state.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ _PyTokenizer_tok_new(void)
struct tok_state *tok = (struct tok_state *)PyMem_Calloc(
1,
sizeof(struct tok_state));
if (tok == NULL)
if (tok == NULL) {
PyErr_NoMemory();
return NULL;
}

tok->buf = tok->cur = tok->inp = NULL;
tok->fp_interactive = 0;
tok->interactive_src_start = NULL;
Expand Down
2 changes: 2 additions & 0 deletions Parser/tokenizer/helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ _PyTokenizer_new_string(const char *s, Py_ssize_t len, struct tok_state *tok)
char* result = (char *)PyMem_Malloc(len + 1);
if (!result) {
tok->done = E_NOMEM;
PyErr_NoMemory();
return NULL;
}
memcpy(result, s, len);
Expand Down Expand Up @@ -221,6 +222,7 @@ _PyTokenizer_translate_newlines(const char *s, int exec_input, int preserve_crlf
buf = PyMem_Malloc(needed_length);
if (buf == NULL) {
tok->done = E_NOMEM;
PyErr_NoMemory();
return NULL;
}
for (current = buf; *s; s++, current++) {
Expand Down
Loading