gh-87092: fix a few cases of incorrect error handling

iritkatriel · iritkatriel · commit e66abb31bfcd · 2023-04-11T21:21:19.000+01:00
diff --git a/Python/compile.c b/Python/compile.c
@@ -6689,7 +6689,10 @@ insert_prefix_instructions(struct compiler_unit *u, basicblock *entryblock,
                 .i_loc = NO_LOCATION,
                 .i_target = NULL,
             };
-            RETURN_IF_ERROR(_PyBasicblock_InsertInstruction(entryblock, ncellsused, &make_cell));
+            if (_PyBasicblock_InsertInstruction(entryblock, ncellsused, &make_cell) < 0) {
+                PyMem_RawFree(sorted);
+                return ERROR;
+            }
             ncellsused += 1;
         }
         PyMem_RawFree(sorted);
@@ -6861,7 +6864,7 @@ optimize_and_assemble_code_unit(struct compiler_unit *u, PyObject *const_cache,
                                     maxdepth, g.g_entryblock, nlocalsplus,
                                     code_flags, filename);
 
- error:
+error:
     Py_XDECREF(consts);
     instr_sequence_fini(&optimized_instrs);
     _PyCfgBuilder_Fini(&g);
@@ -6959,7 +6962,9 @@ instructions_to_instr_sequence(PyObject *instructions, instr_sequence *seq)
 
     for (int i = 0; i < num_insts; i++) {
         if (is_target[i]) {
-            RETURN_IF_ERROR(instr_sequence_use_label(seq, i));
+            if (instr_sequence_use_label(seq, i) < 0) {
+                goto error;
+            }
         }
         PyObject *item = PyList_GET_ITEM(instructions, i);
         if (!PyTuple_Check(item) || PyTuple_GET_SIZE(item) != 6) {
@@ -6997,10 +7002,14 @@ instructions_to_instr_sequence(PyObject *instructions, instr_sequence *seq)
         if (PyErr_Occurred()) {
             goto error;
         }
-        RETURN_IF_ERROR(instr_sequence_addop(seq, opcode, oparg, loc));
+        if (instr_sequence_addop(seq, opcode, oparg, loc) < 0) {
+            goto error;
+        }
     }
     if (seq->s_used && !IS_TERMINATOR_OPCODE(seq->s_instrs[seq->s_used-1].i_opcode)) {
-        RETURN_IF_ERROR(instr_sequence_addop(seq, RETURN_VALUE, 0, NO_LOCATION));
+        if (instr_sequence_addop(seq, RETURN_VALUE, 0, NO_LOCATION) < 0) {
+            goto error;
+        }
     }
     PyMem_Free(is_target);
     return SUCCESS;
@@ -7015,12 +7024,17 @@ instructions_to_cfg(PyObject *instructions, cfg_builder *g)
     instr_sequence seq;
     memset(&seq, 0, sizeof(instr_sequence));
 
-    RETURN_IF_ERROR(
-        instructions_to_instr_sequence(instructions, &seq));
-
-    RETURN_IF_ERROR(instr_sequence_to_cfg(&seq, g));
+    if (instructions_to_instr_sequence(instructions, &seq) < 0) {
+        goto error;
+    }
+    if (instr_sequence_to_cfg(&seq, g) < 0) {
+        goto error;
+    }
     instr_sequence_fini(&seq);
     return SUCCESS;
+error:
+    instr_sequence_fini(&seq);
+    return ERROR;
 }
 
 static PyObject *
