diff options
| author | Lysandros Nikolaou <lisandrosnik@gmail.com> | 2020-06-27 18:35:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-27 18:35:18 (GMT) |
| commit | 5193d0a665eb0944faae9fb20e2062cea0dc02e7 (patch) | |
| tree | bc84aa36929e9545888bf3e0e0a48e2a6823787b /Python/ast.c | |
| parent | 9191eacf9e1a4eabfadaf993779c428de7a0b2b3 (diff) | |
| download | cpython-5193d0a665eb0944faae9fb20e2062cea0dc02e7.zip cpython-5193d0a665eb0944faae9fb20e2062cea0dc02e7.tar.gz cpython-5193d0a665eb0944faae9fb20e2062cea0dc02e7.tar.bz2 | |
[3.9] bpo-41132: Use pymalloc allocator in the f-string parser (GH-21173) (GH-21183)
(cherry picked from commit 6dcbc2422de9e2a7ff89a4689572d84001e230b2)
Automerge-Triggered-By: @pablogsal
Diffstat (limited to 'Python/ast.c')
| -rw-r--r-- | Python/ast.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Python/ast.c b/Python/ast.c index 408591f..3278586 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -4765,7 +4765,7 @@ fstring_compile_expr(const char *expr_start, const char *expr_end, len = expr_end - expr_start; /* Allocate 3 extra bytes: open paren, close paren, null byte. */ - str = PyMem_RawMalloc(len + 3); + str = PyMem_Malloc(len + 3); if (str == NULL) { PyErr_NoMemory(); return NULL; @@ -4781,7 +4781,7 @@ fstring_compile_expr(const char *expr_start, const char *expr_end, mod_n = PyParser_SimpleParseStringFlagsFilename(str, "<fstring>", Py_eval_input, 0); if (!mod_n) { - PyMem_RawFree(str); + PyMem_Free(str); return NULL; } /* Reuse str to find the correct column offset. */ @@ -4789,7 +4789,7 @@ fstring_compile_expr(const char *expr_start, const char *expr_end, str[len+1] = '}'; fstring_fix_node_location(n, mod_n, str); mod = PyAST_FromNode(mod_n, &cf, "<fstring>", c->c_arena); - PyMem_RawFree(str); + PyMem_Free(str); PyNode_Free(mod_n); if (!mod) return NULL; @@ -5305,7 +5305,7 @@ ExprList_Append(ExprList *l, expr_ty exp) Py_ssize_t i; /* We're still using the cached data. Switch to alloc-ing. */ - l->p = PyMem_RawMalloc(sizeof(expr_ty) * new_size); + l->p = PyMem_Malloc(sizeof(expr_ty) * new_size); if (!l->p) return -1; /* Copy the cached data into the new buffer. */ @@ -5313,9 +5313,9 @@ ExprList_Append(ExprList *l, expr_ty exp) l->p[i] = l->data[i]; } else { /* 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) { - PyMem_RawFree(l->p); + PyMem_Free(l->p); l->p = NULL; return -1; } @@ -5343,7 +5343,7 @@ ExprList_Dealloc(ExprList *l) /* Do nothing. */ } else { /* We have dynamically allocated. Free the memory. */ - PyMem_RawFree(l->p); + PyMem_Free(l->p); } l->p = NULL; l->size = -1; |