]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Not all FTP servers provide a banner message. xstrdup do not like NULL pointers
authorHenrik Nordstrom <henrik@henriknordstrom.net>
Thu, 10 Jun 2010 21:38:03 +0000 (23:38 +0200)
committerHenrik Nordstrom <henrik@henriknordstrom.net>
Thu, 10 Jun 2010 21:38:03 +0000 (23:38 +0200)
src/ftp.cc

index 89f3dd09135603d72f3daeb2c24feeba6d1dce4e..b17fb2bfea8e2b164619d52672ea26679c242fbf 100644 (file)
@@ -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() );