svn commit: samba r12760 - branches/SAMBA_3_0/source/tdb trunk/source/tdb

[vlendec at samba.org]

Author: vlendec
Date: 2006-01-07 22:11:30 +0000 (Sat, 07 Jan 2006)
New Revision: 12760

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12760

Log:
Fix bug 3384
Modified:
   branches/SAMBA_3_0/source/tdb/tdbtool.c
   trunk/source/tdb/tdbtool.c


Changeset:
Modified: branches/SAMBA_3_0/source/tdb/tdbtool.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/tdbtool.c	2006-01-07 20:43:36 UTC (rev 12759)
+++ branches/SAMBA_3_0/source/tdb/tdbtool.c	2006-01-07 22:11:30 UTC (rev 12760)
@@ -232,6 +232,11 @@
 {
 	TDB_DATA key, dbuf;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 	dbuf.dptr = data;
@@ -246,6 +251,16 @@
 {
 	TDB_DATA key, dbuf;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
+	if ((data == NULL) || (datalen == 0)) {
+		terror("need data");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 	dbuf.dptr = data;
@@ -263,6 +278,11 @@
 {
 	TDB_DATA key, dbuf;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 
@@ -283,6 +303,11 @@
 {
 	TDB_DATA key;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 
@@ -296,6 +321,11 @@
 	TDB_DATA key, dbuf;
 	TDB_CONTEXT *dst_tdb;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	if ( !tdbname ) {
 		terror("need destination tdb name");
 		return;

Modified: trunk/source/tdb/tdbtool.c
===================================================================
--- trunk/source/tdb/tdbtool.c	2006-01-07 20:43:36 UTC (rev 12759)
+++ trunk/source/tdb/tdbtool.c	2006-01-07 22:11:30 UTC (rev 12760)
@@ -232,6 +232,11 @@
 {
 	TDB_DATA key, dbuf;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 	dbuf.dptr = data;
@@ -246,6 +251,16 @@
 {
 	TDB_DATA key, dbuf;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
+	if ((data == NULL) || (datalen == 0)) {
+		terror("need data");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 	dbuf.dptr = data;
@@ -263,6 +278,11 @@
 {
 	TDB_DATA key, dbuf;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 
@@ -283,6 +303,11 @@
 {
 	TDB_DATA key;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	key.dptr = keyname;
 	key.dsize = keylen;
 
@@ -296,6 +321,11 @@
 	TDB_DATA key, dbuf;
 	TDB_CONTEXT *dst_tdb;
 
+	if ((keyname == NULL) || (keylen == 0)) {
+		terror("need key");
+		return;
+	}
+
 	if ( !tdbname ) {
 		terror("need destination tdb name");
 		return;