src/patches/squid/squid-3.5-14070.patch

   1 ------------------------------------------------------------
   2 revno: 14070
   3 revision-id: squid3@treenet.co.nz-20160805145933-0cpyy47o8955lamx
   4 parent: squidadm@squid-cache.org-20160723121351-iuc8hwstrqd0l1dv
   5 author: Christos Tsantilas <chtsanti@users.sourceforge.net>
   6 committer: Amos Jeffries <squid3@treenet.co.nz>
   7 branch nick: 3.5
   8 timestamp: Sat 2016-08-06 02:59:33 +1200
   9 message:
  10   Squid segfault via Ftp::Client::readControlReply().
  11
  12   Ftp::Client::scheduleReadControlReply(), which may called from the
  13   asynchronous start() or readControlReply()/handleControlReply()
  14   handlers, does not check whether the control connection is still usable
  15   before using it.
  16
  17   This is a Measurement Factory project.
  18 ------------------------------------------------------------
  19 # Bazaar merge directive format 2 (Bazaar 0.90)
  20 # revision_id: squid3@treenet.co.nz-20160805145933-0cpyy47o8955lamx
  21 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  22 # testament_sha1: 1c21ce821f9cbc22b3e8ff2b1029f7084b5f0643
  23 # timestamp: 2016-08-05 15:00:22 +0000
  24 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  25 # base_revision_id: squidadm@squid-cache.org-20160723121351-\
  26 #   iuc8hwstrqd0l1dv
  27 #
  28 # Begin patch
  29 === modified file 'src/clients/FtpClient.cc'
  30 --- src/clients/FtpClient.cc    2016-02-19 23:15:41 +0000
  31 +++ src/clients/FtpClient.cc    2016-08-05 14:59:33 +0000
  32 @@ -314,6 +314,11 @@
  33          /* We've already read some reply data */
  34          handleControlReply();
  35      } else {
  36 +
  37 +        if (!Comm::IsConnOpen(ctrl.conn)) {
  38 +            debugs(9, 3, "cannot read without ctrl " << ctrl.conn);
  39 +            return;
  40 +        }
  41          /*
  42           * Cancel the timeout on the Data socket (if any) and
  43           * establish one on the control socket.
  44