[tor-commits] [flashproxy/master] safe_str addr parsing exception messages.

[dcf at torproject.org]

commit 631ac5d9fe769933cee77a005273e4651054f3cf
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Sep 30 20:00:16 2012 -0700

    safe_str addr parsing exception messages.
    
    These can contain client or proxy addresses:
    'Bad host or port: "localhost.example.com" "4444": [Errno -2] Name or service not known'
---
 facilitator/facilitator |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/facilitator/facilitator b/facilitator/facilitator
index 64fe952..d159ddc 100755
--- a/facilitator/facilitator
+++ b/facilitator/facilitator
@@ -247,7 +247,7 @@ class Handler(SocketServer.StreamRequestHandler):
         try:
             reg = Reg.parse(client_spec, self.client_address[0])
         except ValueError, e:
-            log(u"syntax error in %s: %s" % (safe_str(repr(client_spec)), repr(str(e))))
+            log(u"syntax error in %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e)))))
             self.send_error()
             return False