Skip to content

bpo-8677: use PY_SSIZE_T_CLEAN in Modules/_gdbmodule.c #12464

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
methane merged 2 commits into from
Mar 20, 2019
Merged

bpo-8677: use PY_SSIZE_T_CLEAN in Modules/_gdbmodule.c #12464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b03623c
bpo-8677: use PY_SSIZE_T_CLEAN in Modules/_gdbmodule.c
methane Mar 20, 2019
cc69d55
Update _gdbmmodule.c
methane Mar 20, 2019
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
36 changes: 27 additions & 9 deletions Modules/_gdbmmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* Author: Anthony Baxter, after dbmmodule.c */
/* Doc strings: Mitch Chapman */


#define PY_SSIZE_T_CLEAN
#include "Python.h"

#include <sys/types.h>
Expand Down Expand Up @@ -119,15 +119,36 @@ dbm_length(dbmobject *dp)
return dp->di_size;
}

// Wrapper function for PyArg_Parse(o, "s#", &d.dptr, &d.size).
// This function is needed to support PY_SSIZE_T_CLEAN.
// Return 1 on success, same to PyArg_Parse().
static int
parse_datum(PyObject *o, datum *d, const char *failmsg)
{
Py_ssize_t size;
if (!PyArg_Parse(o, "s#", &d->dptr, &size)) {
if (failmsg != NULL) {
PyErr_SetString(PyExc_TypeError, failmsg);
}
return 0;
}
if (INT_MAX < size) {
PyErr_SetString(PyExc_OverflowError, "size does not fit in an int");
return 0;
}
d->dsize = size;
return 1;
}

static PyObject *
dbm_subscript(dbmobject *dp, PyObject *key)
{
PyObject *v;
datum drec, krec;

if (!PyArg_Parse(key, "s#", &krec.dptr, &krec.dsize) )
if (!parse_datum(key, &krec, NULL)) {
return NULL;

}
if (dp->di_dbm == NULL) {
PyErr_SetString(DbmError,
"GDBM object has already been closed");
Expand Down Expand Up @@ -172,10 +193,9 @@ static int
dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
{
datum krec, drec;
const char *failmsg = "gdbm mappings have bytes or string indices only";

if (!PyArg_Parse(v, "s#", &krec.dptr, &krec.dsize) ) {
PyErr_SetString(PyExc_TypeError,
"gdbm mappings have bytes or string indices only");
if (!parse_datum(v, &krec, failmsg)) {
return -1;
}
if (dp->di_dbm == NULL) {
Expand All @@ -196,9 +216,7 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
}
}
else {
if (!PyArg_Parse(w, "s#", &drec.dptr, &drec.dsize)) {
PyErr_SetString(PyExc_TypeError,
"gdbm mappings have bytes or string elements only");
if (!parse_datum(w, &drec, failmsg)) {
return -1;
}
errno = 0;
Expand Down