From 8b9bd43d40c2140797dd53449eeb5ca2779f4a54 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 30 Sep 2024 03:22:15 +0200 Subject: [PATCH] [3.13] gh-123919: Fix null handling in `_freeze_module.c` (GH-123920) (#123948) gh-123919: Fix null handling in `_freeze_module.c` (GH-123920) (cherry picked from commit c8d1dbef5b770b647aa7ff45fd5b269bc7629d0b) Co-authored-by: sobolevn --- Programs/_freeze_module.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Programs/_freeze_module.c b/Programs/_freeze_module.c index 2a462a42cda..891e4256e89 100644 --- a/Programs/_freeze_module.c +++ b/Programs/_freeze_module.c @@ -110,6 +110,9 @@ static PyObject * compile_and_marshal(const char *name, const char *text) { char *filename = (char *) malloc(strlen(name) + 10); + if (filename == NULL) { + return PyErr_NoMemory(); + } sprintf(filename, "", name); PyObject *code = Py_CompileStringExFlags(text, filename, Py_file_input, NULL, 0); @@ -133,6 +136,9 @@ get_varname(const char *name, const char *prefix) { size_t n = strlen(prefix); char *varname = (char *) malloc(strlen(name) + n + 1); + if (varname == NULL) { + return NULL; + } (void)strcpy(varname, prefix); for (size_t i = 0; name[i] != '\0'; i++) { if (name[i] == '.') { @@ -178,6 +184,11 @@ write_frozen(const char *outpath, const char *inpath, const char *name, fprintf(outfile, "%s\n", header); char *arrayname = get_varname(name, "_Py_M__"); + if (arrayname == NULL) { + fprintf(stderr, "memory error: could not allocate varname\n"); + fclose(outfile); + return -1; + } write_code(outfile, marshalled, arrayname); free(arrayname);