svn commit: samba r16290 - branches/SAMBA_3_0/source/lib trunk/source/lib

[vlendec at samba.org]

Author: vlendec
Date: 2006-06-16 12:30:39 +0000 (Fri, 16 Jun 2006)
New Revision: 16290

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

Log:
Fix Coverity bugs 298 and 298
Modified:
   branches/SAMBA_3_0/source/lib/gencache.c
   trunk/source/lib/gencache.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/gencache.c
===================================================================
--- branches/SAMBA_3_0/source/lib/gencache.c	2006-06-16 04:44:59 UTC (rev 16289)
+++ branches/SAMBA_3_0/source/lib/gencache.c	2006-06-16 12:30:39 UTC (rev 16290)
@@ -349,7 +349,7 @@
 		/* ensure null termination of the key string */
 		keystr = SMB_STRNDUP(node->node_key.dptr, node->node_key.dsize);
 		if (!keystr) {
-			return;
+			break;
 		}
 		
 		/* 
@@ -367,7 +367,7 @@
 		if (!entry) {
 			SAFE_FREE(databuf.dptr);
 			SAFE_FREE(keystr);
-			return;
+			break;
 		}
 
 		SAFE_FREE(databuf.dptr);
@@ -376,7 +376,7 @@
 		if (!valstr) {
 			SAFE_FREE(entry);
 			SAFE_FREE(keystr);
-			return;
+			break;
 		}
 
 		asprintf(&fmt, READ_CACHE_DATA_FMT_TEMPLATE, (unsigned int)databuf.dsize - TIMEOUT_LEN);
@@ -384,7 +384,7 @@
 			SAFE_FREE(valstr);
 			SAFE_FREE(entry);
 			SAFE_FREE(keystr);
-			return;
+			break;
 		}
 		status = sscanf(entry, fmt, &u, valstr);
 		SAFE_FREE(fmt);

Modified: trunk/source/lib/gencache.c
===================================================================
--- trunk/source/lib/gencache.c	2006-06-16 04:44:59 UTC (rev 16289)
+++ trunk/source/lib/gencache.c	2006-06-16 12:30:39 UTC (rev 16290)
@@ -349,7 +349,7 @@
 		/* ensure null termination of the key string */
 		keystr = SMB_STRNDUP(node->node_key.dptr, node->node_key.dsize);
 		if (!keystr) {
-			return;
+			break;
 		}
 		
 		/* 
@@ -367,7 +367,7 @@
 		if (!entry) {
 			SAFE_FREE(databuf.dptr);
 			SAFE_FREE(keystr);
-			return;
+			break;
 		}
 
 		SAFE_FREE(databuf.dptr);
@@ -376,7 +376,7 @@
 		if (!valstr) {
 			SAFE_FREE(entry);
 			SAFE_FREE(keystr);
-			return;
+			break;
 		}
 
 		asprintf(&fmt, READ_CACHE_DATA_FMT_TEMPLATE, (unsigned int)databuf.dsize - TIMEOUT_LEN);
@@ -384,7 +384,7 @@
 			SAFE_FREE(valstr);
 			SAFE_FREE(entry);
 			SAFE_FREE(keystr);
-			return;
+			break;
 		}
 		status = sscanf(entry, fmt, &u, valstr);
 		SAFE_FREE(fmt);