Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various UAFs & cosmetic fixes in Python/{bltinmodule,bytecode,ceval}.c (#33)

Browse source 
* fix UAF in `bltinmodule.c`

* fix UAF in `bytecode.c`

* run `make regen-all`

* various improvements to `ceval.c`

* fix CI
This commit is contained in:
Bénédikt Tran 2025-12-08 00:55:48 +01:00 • committed by GitHub
parent f96a99c222
commit c4ed3c4119
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 61 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/generated_cases.c.h generated
View file

@ -5862,7 +5862,8 @@
_PyFrame_SetStackPointer(frame, stack_pointer);
res_o = _PyEval_LazyImportFrom(tstate, PyStackRef_AsPyObjectBorrow(from), name);
stack_pointer = _PyFrame_GetStackPointer(frame);
} else {
}
else {
_PyFrame_SetStackPointer(frame, stack_pointer);
res_o = _PyEval_ImportFrom(tstate, PyStackRef_AsPyObjectBorrow(from), name);
stack_pointer = _PyFrame_GetStackPointer(frame);
@ -5899,7 +5900,8 @@
PyStackRef_AsPyObjectBorrow(level),
oparg & 0x01);
stack_pointer = _PyFrame_GetStackPointer(frame);
} else {
}
else {
_PyFrame_SetStackPointer(frame, stack_pointer);
res_o = _PyEval_ImportName(tstate, BUILTINS(), GLOBALS(), LOCALS(), name,
PyStackRef_AsPyObjectBorrow(fromlist),
@ -8755,9 +8757,8 @@
if (PyLazyImport_CheckExact(v_o)) {
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *l_v = _PyImport_LoadLazyImportTstate(tstate, v_o);
Py_DECREF(v_o);
Py_SETREF(v_o, l_v);
stack_pointer = _PyFrame_GetStackPointer(frame);
v_o = l_v;
if (v_o == NULL) {
JUMP_TO_LABEL(error);
}
@ -8789,9 +8790,8 @@
if (PyLazyImport_CheckExact(v_o)) {
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *l_v = _PyImport_LoadLazyImportTstate(tstate, v_o);
Py_DECREF(v_o);
Py_SETREF(v_o, l_v);
stack_pointer = _PyFrame_GetStackPointer(frame);
v_o = l_v;
if (v_o == NULL) {
JUMP_TO_LABEL(error);
}
@ -9071,9 +9071,11 @@
if (PyLazyImport_CheckExact(v_o)) {
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *l_v = _PyImport_LoadLazyImportTstate(tstate, v_o);
Py_DECREF(v_o);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (l_v == NULL) {
_PyFrame_SetStackPointer(frame, stack_pointer);
Py_DECREF(v_o);
stack_pointer = _PyFrame_GetStackPointer(frame);
JUMP_TO_LABEL(error);
}
_PyFrame_SetStackPointer(frame, stack_pointer);
@ -9081,11 +9083,14 @@
stack_pointer = _PyFrame_GetStackPointer(frame);
if (err < 0) {
_PyFrame_SetStackPointer(frame, stack_pointer);
Py_DECREF(v_o);
Py_DECREF(l_v);
stack_pointer = _PyFrame_GetStackPointer(frame);
JUMP_TO_LABEL(error);
}
v_o = l_v;
_PyFrame_SetStackPointer(frame, stack_pointer);
Py_SETREF(v_o, l_v);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
v = PyStackRef_FromPyObjectSteal(v_o);
stack_pointer[0] = v;