diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2007-10-06 16:05:18 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2007-10-06 16:05:18 (GMT) |
| commit | 381e1a46cd782bc2090c3f718b34682e06380bbd (patch) | |
| tree | dae937034e88a0a9ad7263be6404fc6fc3375d6b | |
| parent | 76ee2272ff86ad34cd082bc57b7584d36a9b3f28 (diff) | |
| download | cpython-381e1a46cd782bc2090c3f718b34682e06380bbd.zip cpython-381e1a46cd782bc2090c3f718b34682e06380bbd.tar.gz cpython-381e1a46cd782bc2090c3f718b34682e06380bbd.tar.bz2 | |
Backport rev 58343: fix DBSequence.get_key() to not crash/fail/etc.
| -rw-r--r-- | Modules/_bsddb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c index fc44737..7b31054 100644 --- a/Modules/_bsddb.c +++ b/Modules/_bsddb.c @@ -4883,14 +4883,20 @@ DBSequence_get_key(DBSequenceObject* self, PyObject* args) { int err; DBT key; + PyObject *retval; + key.flags = DB_DBT_MALLOC; CHECK_SEQUENCE_NOT_CLOSED(self) MYDB_BEGIN_ALLOW_THREADS err = self->sequence->get_key(self->sequence, &key); MYDB_END_ALLOW_THREADS + if (!err) + retval = PyString_FromStringAndSize(key.data, key.size); + + FREE_DBT(key); RETURN_IF_ERR(); - return PyString_FromStringAndSize(key.data, key.size); + return retval; } static PyObject* |