From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 10 Jun 2010 21:38:03 +0000 (+0200)
Subject: Not all FTP servers provide a banner message. xstrdup do not like NULL pointers
X-Git-Tag: SQUID_3_2_0_1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0324b7f1199fcc13ccadc4659885d4ee2a34675;p=thirdparty%2Fsquid.git

Not all FTP servers provide a banner message. xstrdup do not like NULL pointers
---

diff --git a/src/ftp.cc b/src/ftp.cc
index 89f3dd0913..b17fb2bfea 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -3321,7 +3321,7 @@ FtpStateData::completedListing()
     entry->lock();
     ErrorState *ferr = errorCon(ERR_DIR_LISTING, HTTP_OK, request);
     ferr->ftp.listing = &listing;
-    ferr->ftp.cwd_msg = xstrdup(cwd_message.termedBuf());
+    ferr->ftp.cwd_msg = xstrdup(cwd_message.size()? cwd_message.termedBuf() : "");
     ferr->ftp.server_msg = ctrl.message;
     ctrl.message = NULL;
     entry->replaceHttpReply( ferr->BuildHttpReply() );