From: wessels <>
Date: Sat, 21 Sep 1996 01:29:25 +0000 (+0000)
Subject: From:    Yoichi Shinoda <shinoda@jaist.ac.jp>
X-Git-Tag: SQUID_3_0_PRE1~5756
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9306d95a7b9d33bad0929d8adaacfb0e987740;p=thirdparty%2Fsquid.git

From:    Yoichi Shinoda <shinoda@jaist.ac.jp>
I guess we should not do strcasecmp(strtok(auth_hdr, " \t"), "Basic"))
in ftpStart(), because strtok() returns a null pointer when no more
token is available.
---

diff --git a/src/ftp.cc b/src/ftp.cc
index 80e8978b62..30bcae398f 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.60 1996/09/20 06:28:43 wessels Exp $
+ * $Id: ftp.cc,v 1.61 1996/09/20 19:29:25 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -132,6 +132,7 @@ static void ftpProcessReplyHeader _PARAMS((FtpData * data, char *buf, int size))
 static void ftpServerClosed _PARAMS((int fd, void *nodata));
 static void ftp_login_parser _PARAMS((char *login, FtpData * data));
 static char *ftpTransferMode _PARAMS((char *urlpath));
+static char *ftpGetBasicAuth _PARAMS((char *req_hdr));
 
 /* Global functions not declared in ftp.h */
 void ftpLifetimeExpire(int fd, FtpData * data);
@@ -566,6 +567,24 @@ ftpConnInProgress(int fd, FtpData * data)
 	ipcacheInvalidate(data->request->host);
 }
 
+static char *
+ftpGetBasicAuth(char *req_hdr)
+{
+    char *auth_hdr;
+    char *t;
+    if (req_hdr == NULL)
+	return NULL;
+    if ((auth_hdr = mime_get_header(req_hdr, "Authorization")) == NULL)
+	return NULL;
+    if ((t = strtok(auth_hdr, " \t")) == NULL)
+	return NULL;
+    if (strcasecmp(t, "Basic") != 0)
+	return NULL;
+    if ((t = strtok(NULL, " \t")) == NULL)
+	return NULL;
+    return base64_decode(t);
+}
+
 
 int
 ftpStart(int unusedfd, char *url, request_t * request, StoreEntry * entry)
@@ -573,7 +592,6 @@ ftpStart(int unusedfd, char *url, request_t * request, StoreEntry * entry)
     LOCAL_ARRAY(char, realm, 8192);
     FtpData *data = NULL;
     char *req_hdr = entry->mem_obj->mime_hdr;
-    char *auth_hdr;
     char *response;
     char *auth;
 
@@ -585,15 +603,8 @@ ftpStart(int unusedfd, char *url, request_t * request, StoreEntry * entry)
     storeLockObject(data->entry = entry, NULL, NULL);
     data->request = requestLink(request);
 
-    auth_hdr = mime_get_header(req_hdr, "Authorization");
-    auth = NULL;
-    if (auth_hdr) {
-	if (strcasecmp(strtok(auth_hdr, " \t"), "Basic") == 0) {
-	    auth = base64_decode(strtok(NULL, " \t"));
-	}
-    }
     /* Parse login info. */
-    if (auth) {
+    if ((auth = ftpGetBasicAuth(req_hdr))) {
 	ftp_login_parser(auth, data);
 	data->authenticated = 1;
     } else {