commit 361ed15383845bffc017b6a14acfb9da8f63ef73
author Gregory P. Smith <greg@mad-scientist.com> Thu Aug 23 07:32:27 2007 +0000
committer Gregory P. Smith <greg@mad-scientist.com> Thu Aug 23 07:32:27 2007 +0000
tree 808d7729ad334a8b32e31fca6acd1edf010d7398
parent e5a8dc684ce67578f1bac94c1a76fea659d4ace7

Require strict bytes objects for all bsddb.db input values.

Modules/_bsddb.c

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index 149cd98..389b103 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -380,11 +380,13 @@
     if (obj == Py_None) {
         /* no need to do anything, the structure has already been zeroed */
     }
-    else if (!PyArg_Parse(obj, "s#", &dbt->data, &dbt->size)) {
+    else if (!PyBytes_Check(obj)) {
         PyErr_SetString(PyExc_TypeError,
-                        "Data values must be of type string or None.");
+                        "Data values must be of type bytes or None.");
         return 0;
     }
+    dbt->data = PyBytes_AS_STRING(obj);
+    dbt->size = PyBytes_GET_SIZE(obj);
     return 1;
 }
 
@@ -4737,7 +4739,7 @@
     char* gid=NULL;
     int   gid_size=0;
 
-    if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
+    if (!PyArg_ParseTuple(args, "y#:prepare", &gid, &gid_size))
         return NULL;
 
     if (gid_size != DB_XIDDATASIZE) {
@@ -5915,6 +5917,7 @@
 
 #if (DBVER >= 33)
     ADD_INT(d, DB_DONOTINDEX);
+    ADD_INT(d, DB_XIDDATASIZE);
 #endif
 
 #if (DBVER >= 41)