update to stdlib 3.8.12

1 files changed, 8 insertions, 3 deletions

diff --git a/lib-python/3/smtplib.py b/lib-python/3/smtplib.py
index 4c5ba7e10d..9c390db0bf 100755
--- a/lib-python/3/smtplib.py
+++ b/lib-python/3/smtplib.py
@@ -365,10 +365,15 @@ class SMTP:
     def putcmd(self, cmd, args=""):
         """Send a command to the server."""
         if args == "":
-            str = '%s%s' % (cmd, CRLF)
+            s = cmd
         else:
-            str = '%s %s%s' % (cmd, args, CRLF)
-        self.send(str)
+            s = f'{cmd} {args}'
+        if '\r' in s or '\n' in s:
+            s = s.replace('\n', '\\n').replace('\r', '\\r')
+            raise ValueError(
+                f'command and arguments contain prohibited newline characters: {s}'
+            )
+        self.send(f'{s}{CRLF}')
 
     def getreply(self):
         """Get a reply from the server.