Skip to content

[3.11] gh-104645: fix error handling in marshal tests (GH-104646) #104663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2023
Merged

[3.11] gh-104645: fix error handling in marshal tests (GH-104646) #104663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4639,10 +4639,9 @@ pymarshal_write_long_to_file(PyObject* self, PyObject *args)
}

PyMarshal_WriteLongToFile(value, fp, version);
assert(!PyErr_Occurred());

fclose(fp);
if (PyErr_Occurred())
return NULL;
Py_RETURN_NONE;
}

Expand All @@ -4665,10 +4664,9 @@ pymarshal_write_object_to_file(PyObject* self, PyObject *args)
}

PyMarshal_WriteObjectToFile(obj, fp, version);
assert(!PyErr_Occurred());

fclose(fp);
if (PyErr_Occurred())
return NULL;
Py_RETURN_NONE;
}

Expand Down Expand Up @@ -4726,48 +4724,46 @@ pymarshal_read_long_from_file(PyObject* self, PyObject *args)
static PyObject*
pymarshal_read_last_object_from_file(PyObject* self, PyObject *args)
{
PyObject *obj;
long pos;
PyObject *filename;
FILE *fp;

if (!PyArg_ParseTuple(args, "O:pymarshal_read_last_object_from_file", &filename))
return NULL;

fp = _Py_fopen_obj(filename, "rb");
FILE *fp = _Py_fopen_obj(filename, "rb");
if (fp == NULL) {
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}

obj = PyMarshal_ReadLastObjectFromFile(fp);
pos = ftell(fp);
PyObject *obj = PyMarshal_ReadLastObjectFromFile(fp);
long pos = ftell(fp);

fclose(fp);
if (obj == NULL) {
return NULL;
}
return Py_BuildValue("Nl", obj, pos);
}

static PyObject*
pymarshal_read_object_from_file(PyObject* self, PyObject *args)
{
PyObject *obj;
long pos;
PyObject *filename;
FILE *fp;

if (!PyArg_ParseTuple(args, "O:pymarshal_read_object_from_file", &filename))
return NULL;

fp = _Py_fopen_obj(filename, "rb");
FILE *fp = _Py_fopen_obj(filename, "rb");
if (fp == NULL) {
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}

obj = PyMarshal_ReadObjectFromFile(fp);
pos = ftell(fp);
PyObject *obj = PyMarshal_ReadObjectFromFile(fp);
long pos = ftell(fp);

fclose(fp);
if (obj == NULL) {
return NULL;
}
return Py_BuildValue("Nl", obj, pos);
}

Expand Down