commit e5eae474c431af2880a68f6329840b9288fc4bc1
author Dong-hee Na <donghee.na92@gmail.com> Thu Jul 27 00:50:36 2017 +0900
committer Victor Stinner <victor.stinner@gmail.com> Wed Jul 26 17:50:36 2017 +0200
tree e96d149c3b0d9f63f6a794dd274959f00a9003ca
parent 0666d0e50432e3b0109db96b8e48fb6c496bd49c

[2.7] bpo-30119: fix ftplib.FTP.putline() to throw an error for a illegal command (#1214) (#2894)

Lib/ftplib.py

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 153647b..6644554 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -171,6 +171,8 @@
 
     # Internal: send one line to the server, appending CRLF
     def putline(self, line):
+        if '\r' in line or '\n' in line:
+            raise ValueError('an illegal newline character should not be contained')
         line = line + CRLF
         if self.debugging > 1: print '*put*', self.sanitize(line)
         self.sock.sendall(line)