From 9bfab3c125ed490cbbb838b915420880a59171ad Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Aug 2016 02:43:36 +0000
Subject: merge revision(s) 55579: [Backport #12556]

	* lib/net/ftp.rb (putline): raise an ArgumentError when
	  CR or LF is included in a line.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/ftp.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 5b63764625..c9b80c6804 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -280,6 +280,9 @@ module Net
       if @debug_mode
         print "put: ", sanitize(line), "\n"
       end
+      if /[\r\n]/ =~ line
+        raise ArgumentError, "A line must not contain CR or LF"
+      end
       line = line + CRLF
       @sock.write(line)
     end
-- 
cgit v1.2.3