From 2c3e0d94b2357d53e3a460dec244b1e98462ede4 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Thu, 1 Nov 2007 21:22:40 +0000 Subject: [PATCH] Backport r58757, r58758, r58759. Undoes incorrect dbtables fix and errant strdup introduced as described below: r58757 | gregory.p.smith | 2007-11-01 14:08:14 -0700 (Thu, 01 Nov 2007) | 4 lines Fix bug introduced in revision 58385. Database keys could no longer have NULL bytes in them. Replace the errant strdup with a malloc+memcpy. Adds a unit test for the correct behavior. r58758 | gregory.p.smith | 2007-11-01 14:15:36 -0700 (Thu, 01 Nov 2007) | 3 lines Undo revision 58533 58534 fixes. Those were a workaround for a problem introduced by 58385. r58759 | gregory.p.smith | 2007-11-01 14:17:47 -0700 (Thu, 01 Nov 2007) | 2 lines false "fix" undone as correct problem was found and fixed. --- Lib/bsddb/dbtables.py | 5 ++--- Lib/bsddb/test/test_misc.py | 25 +++++++++++++++++++++---- Misc/NEWS | 4 ---- Modules/_bsddb.c | 4 +++- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Lib/bsddb/dbtables.py b/Lib/bsddb/dbtables.py index f6c7f02cfe..be2641f6fa 100644 --- a/Lib/bsddb/dbtables.py +++ b/Lib/bsddb/dbtables.py @@ -360,12 +360,11 @@ class bsdTableDB : unique = 0 while not unique: # Generate a random 64-bit row ID string - # (note: this code has <64 bits of randomness + # (note: might have <64 bits of true randomness # but it's plenty for our database id needs!) - # We must ensure that no null bytes are in the id value. blist = [] for x in xrange(_rowid_str_len): - blist.append(random.randint(1,255)) + blist.append(random.randint(0,255)) newid = struct.pack('B'*_rowid_str_len, *blist) # Guarantee uniqueness by adding this key to the database diff --git a/Lib/bsddb/test/test_misc.py b/Lib/bsddb/test/test_misc.py index e7df4a8907..01b3699841 100644 --- a/Lib/bsddb/test/test_misc.py +++ b/Lib/bsddb/test/test_misc.py @@ -29,10 +29,8 @@ class MiscTestCase(unittest.TestCase): os.remove(self.filename) except OSError: pass - import glob - files = glob.glob(os.path.join(self.homeDir, '*')) - for file in files: - os.remove(file) + import shutil + shutil.rmtree(self.homeDir) def test01_badpointer(self): dbs = dbshelve.open(self.filename) @@ -72,6 +70,25 @@ class MiscTestCase(unittest.TestCase): db1.close() os.unlink(self.filename) + def test05_key_with_null_bytes(self): + try: + db1 = db.DB() + db1.open(self.filename, None, db.DB_HASH, db.DB_CREATE) + db1['a'] = 'eh?' + db1['a\x00'] = 'eh zed.' + db1['a\x00a'] = 'eh zed eh?' + db1['aaa'] = 'eh eh eh!' + keys = db1.keys() + keys.sort() + self.assertEqual(['a', 'a\x00', 'a\x00a', 'aaa'], keys) + self.assertEqual(db1['a'], 'eh?') + self.assertEqual(db1['a\x00'], 'eh zed.') + self.assertEqual(db1['a\x00a'], 'eh zed eh?') + self.assertEqual(db1['aaa'], 'eh eh eh!') + finally: + db1.close() + os.unlink(self.filename) + #---------------------------------------------------------------------- diff --git a/Misc/NEWS b/Misc/NEWS index 8b505df013..e20a9a0a89 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -120,10 +120,6 @@ Extension Modules - Bug #1233: fix bsddb.dbshelve.DBShelf append method to work as intended for RECNO databases. -- Fix bsddb.dbtables: Don't randomly corrupt newly inserted rows by - picking a rowid string with null bytes in it. Such rows could not - later be deleted, modified or individually selected. - - Bug #1726026: Correct the field names of WIN32_FIND_DATAA and WIN32_FIND_DATAW structures in the ctypes.wintypes module. diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c index 195132e3d2..999e3025a3 100644 --- a/Modules/_bsddb.c +++ b/Modules/_bsddb.c @@ -432,11 +432,13 @@ make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags) * the code check for DB_THREAD and forceably set DBT_MALLOC * when we otherwise would leave flags 0 to indicate that. */ - key->data = strdup(PyString_AS_STRING(keyobj)); + key->data = malloc(PyString_GET_SIZE(keyobj)); if (key->data == NULL) { PyErr_SetString(PyExc_MemoryError, "Key memory allocation failed"); return 0; } + memcpy(key->data, PyString_AS_STRING(keyobj), + PyString_GET_SIZE(keyobj)); key->flags = DB_DBT_REALLOC; key->size = PyString_GET_SIZE(keyobj); } -- 2.50.1