From: Gregory P. Smith <greg@mad-scientist.com>
Date: Sun, 19 Dec 2004 23:27:48 +0000 (+0000)
Subject: In 1.17.6.4 part of the patch committed in 1.17.6.3 got reapplied to
X-Git-Tag: v2.3.5c1~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=923fae44e01c3e7ac50cf815d647aa7f4b9ec9ec;p=thirdparty%2FPython%2Fcpython.git

In 1.17.6.4 part of the patch committed in 1.17.6.3 got reapplied to
the end of a second function whos code was identical enough for patch
not to reject the patch.  this reverses that misapplication (only the
DBC_set_range method needed modification, not DBC_set as well).  This
problem only exists in the release32-maint branch.
---

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index 3e97f881169f..599584868705 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -2849,15 +2849,7 @@ DBC_set(DBCursorObject* self, PyObject* args, PyObject *kwargs)
                                    data.data, data.size);
             break;
         }
-        if (_DB_get_type(self->mydb) == DB_BTREE) {
-            /* the only time a malloced key is returned is when we
-             * call this on a BTree database because it performs
-             * partial matching and needs to return the real key.
-             * All others leave key untouched [where calling free()
-             * on it would often segfault].
-             */
-            FREE_DBT(key);
-        }
+        FREE_DBT(key);
         FREE_DBT(data);
     }