changeset d66a2440ffcb in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=d66a2440ffcb description: transform non-character unicode to ? char (\ufffd) as soon as we receive them. Fixes #6974

diffstat:

src/common/xmpp/dispatcher_nb.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)

diffs (44 lines):

diff -r c02744737254 -r d66a2440ffcb src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Thu Sep 15 21:51:51 2011 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Thu Sep 15 22:00:41 2011 +0200 @@ -21,6 +21,7 @@ """

import simplexml, sys, locale +import re from xml.parsers.expat import ExpatError from plugin import PlugIn from protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, @@ -93,6 +94,24 @@ # Let the dispatcher know if there is support for stream management self.sm = None

+ # \ufddo -> \ufdef range + c = u'\ufdd0' + r = c.encode('utf8') + while (c < u'\ufdef'): + c = unichr(ord(c) + 1) + r += '|' + c.encode('utf8') + + # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff + c = u'\ufffe' + r += '|' + c.encode('utf8') + r += '|' + unichr(ord(c) + 1).encode('utf8') + while (c < u'\U0010fffe'): + c = unichr(ord(c) + 0x10000) + r += '|' + c.encode('utf8') + r += '|' + unichr(ord(c) + 1).encode('utf8') + + self.invalid_chars_re = re.compile(r) + def getAnID(self): global outgoingID outgoingID += 1 @@ -193,6 +212,7 @@ # disconnect method will never be called. # Is this intended? # also look at transports start_disconnect() + data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data) for handler in self._cycleHandlers: handler(self) if len(self._pendingExceptions) > 0: