[PATCH 03/14] pytdb: Fix repr segfault for internal db
Kirill Smelkov
kirr at landau.phys.spbu.ru
Sun Sep 19 03:53:21 MDT 2010
From: Kirill Smelkov <kirr at mns.spb.ru>
The problem was tdb->name is NULL for TDB_INTERNAL databases, and
so it was crashing ...
#0 0xb76944f3 in strlen () from /lib/i686/cmov/libc.so.6
#1 0x0809862b in PyString_FromFormatV (format=0xb72b6a26 "Tdb('%s')", vargs=0xbfc26a94 "")
at ../Objects/stringobject.c:211
#2 0x08098888 in PyString_FromFormat (format=0xb72b6a26 "Tdb('%s')") at ../Objects/stringobject.c:358
#3 0xb72b65f2 in tdb_object_repr (self=0xb759e060) at ./pytdb.c:439
Cc: 597089 at bugs.debian.org
Signed-off-by: Kirill Smelkov <kirr at mns.spb.ru>
---
lib/tdb/pytdb.c | 4 +++-
lib/tdb/python/tests/simple.py | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index f6fb8ab..e50615f 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -409,7 +409,9 @@ static PyGetSetDef tdb_object_getsetters[] = {
static PyObject *tdb_object_repr(PyTdbObject *self)
{
- return PyString_FromFormat("Tdb('%s')", tdb_name(self->ctx));
+ return PyString_FromFormat("Tdb('%s')",
+ (tdb_get_flags(self->ctx) & TDB_INTERNAL) ? "<internal>"
+ : tdb_name(self->ctx));
}
static void tdb_object_dealloc(PyTdbObject *self)
diff --git a/lib/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py
index 5db8247..258a486 100644
--- a/lib/tdb/python/tests/simple.py
+++ b/lib/tdb/python/tests/simple.py
@@ -28,6 +28,14 @@ class CloseTdbTests(TestCase):
self.tdb.close()
+class InternalTdbTests(TestCase):
+ def test_repr(self):
+ self.tdb = tdb.Tdb("whatever", tdb_flags=tdb.INTERNAL)
+
+ # repr used to crash on internal db
+ self.assertEquals(repr(self.tdb), "Tdb('<internal>')")
+
+
class SimpleTdbTests(TestCase):
def setUp(self):
--
1.7.3.rc2
More information about the samba-technical
mailing list