From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 19 May 2007 04:37:31 +0000 (+0000)
Subject: Backport rev 55452:
X-Git-Tag: v2.5.2c1~290
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73bf1018d654553bf659dfa6f4608875f89ca2c0;p=thirdparty%2FPython%2Fcpython.git

Backport rev 55452:
Whoops, need to pay attention to those test failures.
Move the clear to *before* the first use, not after.
---

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index f064878966f4..e7613fb31598 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -1706,6 +1706,7 @@ DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs)
     CHECK_DB_NOT_CLOSED(self);
     if (!make_key_dbt(self, keyobj, &key, NULL))
         return NULL;
+    CLEAR_DBT(data);
     if ( !make_dbt(dataobj, &data) ||
          !checkTxnObj(txnobj, &txn) )
     {
@@ -1713,7 +1714,6 @@ DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs)
         return NULL;
     }
 
-    CLEAR_DBT(data);
     flags |= DB_GET_BOTH;
 
     if (CHECK_DBFLAG(self, DB_THREAD)) {