svn commit: samba r16250 - branches/SAMBA_3_0/source/client trunk/source/client

[vlendec at samba.org]

Author: vlendec
Date: 2006-06-15 11:17:57 +0000 (Thu, 15 Jun 2006)
New Revision: 16250

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

Log:
Fix Klokwork IDs 148, 151, 152, 154.

Volker


Modified:
   branches/SAMBA_3_0/source/client/client.c
   trunk/source/client/client.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/client.c
===================================================================
--- branches/SAMBA_3_0/source/client/client.c	2006-06-15 10:48:53 UTC (rev 16249)
+++ branches/SAMBA_3_0/source/client/client.c	2006-06-15 11:17:57 UTC (rev 16250)
@@ -269,7 +269,7 @@
 	else
 		pstrcat(cur_dir,p);
 
-	if (*(cur_dir+strlen(cur_dir)-1) != '\\') {
+	if ((cur_dir[0] != '\0') && (*(cur_dir+strlen(cur_dir)-1) != '\\')) {
 		pstrcat(cur_dir, "\\");
 	}
 	
@@ -647,7 +647,7 @@
 	dir_total = 0;
 	if (strcmp(cur_dir, "\\") != 0) {
 		pstrcpy(mask,cur_dir);
-		if(mask[strlen(mask)-1]!='\\')
+		if ((mask[0] != '\0') && (mask[strlen(mask)-1]!='\\'))
 			pstrcat(mask,"\\");
 	} else {
 		pstrcpy(mask, "\\");
@@ -686,7 +686,7 @@
 	
 	dir_total = 0;
 	pstrcpy(mask,cur_dir);
-	if(mask[strlen(mask)-1]!='\\')
+	if ((mask[0] != '\0') && (mask[strlen(mask)-1]!='\\'))
 		pstrcat(mask,"\\");
 	
 	if (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
@@ -1008,7 +1008,7 @@
 
 	while (next_token_nr(NULL,p,NULL,sizeof(buf))) {
 		pstrcpy(mget_mask,cur_dir);
-		if(mget_mask[strlen(mget_mask)-1]!='\\')
+		if ((mask[0] != '\0') && (mget_mask[strlen(mget_mask)-1]!='\\'))
 			pstrcat(mget_mask,"\\");
 		
 		if (*p == '\\')

Modified: trunk/source/client/client.c
===================================================================
--- trunk/source/client/client.c	2006-06-15 10:48:53 UTC (rev 16249)
+++ trunk/source/client/client.c	2006-06-15 11:17:57 UTC (rev 16250)
@@ -269,7 +269,7 @@
 	else
 		pstrcat(cur_dir,p);
 
-	if (*(cur_dir+strlen(cur_dir)-1) != '\\') {
+	if ((cur_dir[0] != '\0') && (*(cur_dir+strlen(cur_dir)-1) != '\\')) {
 		pstrcat(cur_dir, "\\");
 	}
 	
@@ -647,7 +647,7 @@
 	dir_total = 0;
 	if (strcmp(cur_dir, "\\") != 0) {
 		pstrcpy(mask,cur_dir);
-		if(mask[strlen(mask)-1]!='\\')
+		if ((mask[0] != '\0') && (mask[strlen(mask)-1]!='\\'))
 			pstrcat(mask,"\\");
 	} else {
 		pstrcpy(mask, "\\");
@@ -686,7 +686,7 @@
 	
 	dir_total = 0;
 	pstrcpy(mask,cur_dir);
-	if(mask[strlen(mask)-1]!='\\')
+	if ((mask[0] != '\0') && (mask[strlen(mask)-1]!='\\'))
 		pstrcat(mask,"\\");
 	
 	if (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
@@ -1008,7 +1008,7 @@
 
 	while (next_token_nr(NULL,p,NULL,sizeof(buf))) {
 		pstrcpy(mget_mask,cur_dir);
-		if(mget_mask[strlen(mget_mask)-1]!='\\')
+		if ((mask[0] != '\0') && (mget_mask[strlen(mget_mask)-1]!='\\'))
 			pstrcat(mget_mask,"\\");
 		
 		if (*p == '\\')