]> granicus.if.org Git - python/commitdiff
Merge 58343: attempt to fix DBSequence.get_key() to not fail or crash.
authorGregory P. Smith <greg@mad-scientist.com>
Sat, 6 Oct 2007 08:22:26 +0000 (08:22 +0000)
committerGregory P. Smith <greg@mad-scientist.com>
Sat, 6 Oct 2007 08:22:26 +0000 (08:22 +0000)
Modules/_bsddb.c

index 6f323d52e3cc42e116214595bec845f5e4201768..175dec3d49d27b5a78b59a4a5dbcc5412749baf7 100644 (file)
@@ -5024,14 +5024,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 = PyBytes_FromStringAndSize(key.data, key.size);
+
+    free_dbt(&key);
     RETURN_IF_ERR();
 
-    return PyBytes_FromStringAndSize(key.data, key.size);
+    return retval;
 }
 
 static PyObject*