From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jan 1999 10:42:29 +0000 (+0000)
Subject: fixed bug where strtok() could return NULL in getpassf().
X-Git-Tag: v2.3.0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=379e689dacec3b520d0e6fd6d655034f924a811b;p=thirdparty%2Frsync.git

fixed bug where strtok() could return NULL in getpassf().
---

diff --git a/authenticate.c b/authenticate.c
index 896366aa..885e40b6 100644
--- a/authenticate.c
+++ b/authenticate.c
@@ -170,8 +170,10 @@ static char *getpassf(char *filename)
 	buffer[sizeof(buffer)-1]='\0';
 	if ( (len=read(fd,buffer,sizeof(buffer)-1)) > 0)
 	{
+		char *p = strtok(buffer,"\n\r");
 		close(fd);
-		return strdup(strtok(buffer,"\n\r"));
+		if (p) p = strdup(p);
+		return p;
 	}	
 
 	return NULL;