mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

36 lines
1.5 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/kde/kdelibs/post-3.3.2-kdelibs-kioslave.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./kioslave/ftp/ftp.cc 21 Sep 2004 16:17:56 -0000 1.213.2.1
  20. +++ ./kioslave/ftp/ftp.cc 26 Dec 2004 00:29:54 -0000 1.213.2.2
  21. @@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
  22. {
  23. assert(m_control != NULL); // must have control connection socket
  24. + if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
  25. + {
  26. + kdWarning(7102) << "Invalid command received (contains CR or LF): "
  27. + << cmd.data() << endl;
  28. + error( ERR_UNSUPPORTED_ACTION, m_host );
  29. + return false;
  30. + }
  31. +
  32. // Don't print out the password...
  33. bool isPassCmd = (cmd.left(4).lower() == "pass");
  34. if ( !isPassCmd )