Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-41132: Use pymalloc allocator in the f-string parser (GH-21173)

This commit is contained in:
Lysandros Nikolaou 2020-06-27 20:47:00 +03:00 committed by GitHub
parent 9cfcdb7d6e
commit 6dcbc2422d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Parser/pegen.c
View File

@ -395,7 +395,7 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
const char *fstring_msg = "f-string: "; const char *fstring_msg = "f-string: ";
Py_ssize_t len = strlen(fstring_msg) + strlen(errmsg); Py_ssize_t len = strlen(fstring_msg) + strlen(errmsg);
char *new_errmsg = PyMem_RawMalloc(len + 1); // Lengths of both strings plus NULL character char *new_errmsg = PyMem_Malloc(len + 1); // Lengths of both strings plus NULL character
if (!new_errmsg) { if (!new_errmsg) {
return (void *) PyErr_NoMemory(); return (void *) PyErr_NoMemory();
} }
@ -443,7 +443,7 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
Py_DECREF(errstr); Py_DECREF(errstr);
Py_DECREF(value); Py_DECREF(value);
if (p->start_rule == Py_fstring_input) { if (p->start_rule == Py_fstring_input) {
PyMem_RawFree((void *)errmsg); PyMem_Free((void *)errmsg);
} }
return NULL; return NULL;
@ -451,7 +451,7 @@ error:
Py_XDECREF(errstr); Py_XDECREF(errstr);
Py_XDECREF(error_line); Py_XDECREF(error_line);
if (p->start_rule == Py_fstring_input) { if (p->start_rule == Py_fstring_input) {
PyMem_RawFree((void *)errmsg); PyMem_Free((void *)errmsg);
} }
return NULL; return NULL;
} }

14
Parser/string_parser.c
View File

@ -592,7 +592,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
len = expr_end - expr_start; len = expr_end - expr_start;
/* Allocate 3 extra bytes: open paren, close paren, null byte. */ /* Allocate 3 extra bytes: open paren, close paren, null byte. */
str = PyMem_RawMalloc(len + 3); str = PyMem_Malloc(len + 3);
if (str == NULL) { if (str == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; return NULL;
@ -605,7 +605,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
struct tok_state* tok = PyTokenizer_FromString(str, 1); struct tok_state* tok = PyTokenizer_FromString(str, 1);
if (tok == NULL) { if (tok == NULL) {
PyMem_RawFree(str); PyMem_Free(str);
return NULL; return NULL;
} }
Py_INCREF(p->tok->filename); Py_INCREF(p->tok->filename);
@ -631,7 +631,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
result = expr; result = expr;
exit: exit:
PyMem_RawFree(str); PyMem_Free(str);
_PyPegen_Parser_Free(p2); _PyPegen_Parser_Free(p2);
PyTokenizer_Free(tok); PyTokenizer_Free(tok);
return result; return result;
@ -1143,7 +1143,7 @@ ExprList_Append(ExprList *l, expr_ty exp)
Py_ssize_t i; Py_ssize_t i;
/* We're still using the cached data. Switch to /* We're still using the cached data. Switch to
alloc-ing. */ alloc-ing. */
l->p = PyMem_RawMalloc(sizeof(expr_ty) * new_size); l->p = PyMem_Malloc(sizeof(expr_ty) * new_size);
if (!l->p) { if (!l->p) {
return -1; return -1;
} }
@ -1153,9 +1153,9 @@ ExprList_Append(ExprList *l, expr_ty exp)
} }
} else { } else {
/* Just realloc. */ /* Just realloc. */
expr_ty *tmp = PyMem_RawRealloc(l->p, sizeof(expr_ty) * new_size); expr_ty *tmp = PyMem_Realloc(l->p, sizeof(expr_ty) * new_size);
if (!tmp) { if (!tmp) {
PyMem_RawFree(l->p); PyMem_Free(l->p);
l->p = NULL; l->p = NULL;
return -1; return -1;
} }
@ -1183,7 +1183,7 @@ ExprList_Dealloc(ExprList *l)
/* Do nothing. */ /* Do nothing. */
} else { } else {
/* We have dynamically allocated. Free the memory. */ /* We have dynamically allocated. Free the memory. */
PyMem_RawFree(l->p); PyMem_Free(l->p);
} }
l->p = NULL; l->p = NULL;
l->size = -1; l->size = -1;