From: Volker Lendecke <vl@samba.org>
Date: Fri, 3 May 2019 13:42:42 +0000 (+0200)
Subject: dbwrap: Fix tdb_data_buf()
X-Git-Tag: tdb-1.4.1~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30abea8815113045b7ee075352c415fe176a48fe;p=thirdparty%2Fsamba.git

dbwrap: Fix tdb_data_buf()

IIRC there are platforms that don't like memcpy() with len=0.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
index 79c83b1a5e2..ff6c9224905 100644
--- a/lib/dbwrap/dbwrap.c
+++ b/lib/dbwrap/dbwrap.c
@@ -643,7 +643,7 @@ static ssize_t tdb_data_buf(const TDB_DATA *dbufs, int num_dbufs,
 		}
 		needed = tmp;
 
-		if (needed <= buflen) {
+		if ((thislen != 0) && (needed <= buflen)) {
 			memcpy(p, dbufs[i].dptr, thislen);
 			p += thislen;
 		}