Attempt to patch a possible message injection hole.

1 files changed, 7 insertions, 1 deletions

diff --git a/irc.py b/irc.py
index a16c61b..7a4bed4 100755
--- a/irc.py
+++ b/irc.py
@@ -42,6 +42,9 @@ class Bot(asynchat.async_chat):
       import threading
       self.sending = threading.RLock()
 
+   # def push(self, *args, **kargs): 
+   #    asynchat.async_chat.push(self, *args, **kargs)
+
    def __write(self, args, text=None): 
       # print '%r %r %r' % (self, args, text)
       try: 
@@ -148,7 +151,10 @@ class Bot(asynchat.async_chat):
             self.sending.release()
             return
 
-      self.__write(('PRIVMSG', recipient), text)
+      def safe(input): 
+         input = input.replace('\n', '')
+         return input.replace('\r', '')
+      self.__write(('PRIVMSG', safe(recipient)), safe(text))
       self.stack.append((time.time(), text))
       self.stack = self.stack[-10:]