merged fix for tdb_unpack from 2_2

(This used to be commit 200b682e9bbe79897343422f7c870382ed6de40a)

diff --git a/source3/tdb/tdbutil.c b/source3/tdb/tdbutil.c
index 409397366a920df0873d55717e463a0e132a45fc..0a2f1f84d458a6e438e5d53d7d83db1a6a8d0822 100644 (file)
--- a/source3/tdb/tdbutil.c
+++ b/source3/tdb/tdbutil.c
@@ -292,7 +292,10 @@ int tdb_unpack(char *buf, int bufsize, char *fmt, ...)
                        len = 4;
                        if (bufsize < len) goto no_space;
                        *i = IVAL(buf, 0);
-                       if (! *i) break;
+                       if (! *i) {
+                               *b = NULL;
+                               break;
+                       }
                        len += *i;
                        if (bufsize < len) goto no_space;
                        *b = (char *)malloc(*i);