Handle out of memory errors

mpage · Sep 13, 2024 · 6d4fe73 · 6d4fe73
1 parent d34adeb
commit 6d4fe73
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -193,6 +193,7 @@ dummy_func(
         op(_LOAD_BYTECODE, (--)) {
             #ifdef Py_GIL_DISABLED
             _Py_CODEUNIT *bytecode = _PyEval_GetExecutableCode(_PyFrame_GetCode(frame));
+            ERROR_IF(bytecode == NULL, error);
             if (frame->bytecode != bytecode) {
                 int off = this_instr - frame->bytecode;
                 frame->bytecode = bytecode;
@@ -222,6 +223,7 @@ dummy_func(
             DEOPT_IF(eval_breaker != version);
             #ifdef Py_GIL_DISABLED
             _Py_CODEUNIT *bytecode = _PyEval_GetExecutableCode(_PyFrame_GetCode(frame));
+            ERROR_IF(bytecode == NULL, error);
             if (frame->bytecode != bytecode) {
                 /* Avoid using this_instr here so that _RESUME_CHECK can be included
                    in traces.

diff --git a/Python/ceval.c b/Python/ceval.c
@@ -812,6 +812,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         /* Load thread-local bytecode */
         _Py_CODEUNIT *bytecode =
             _PyEval_GetExecutableCode(_PyFrame_GetCode(frame));
+        if (bytecode == NULL) {
+            goto error;
+        }
         if (frame->bytecode != bytecode) {
             int off = frame->instr_ptr - frame->bytecode;
             frame->bytecode = bytecode;

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h