changeset 2979:f44a95f566d2

core, plugin XEP-0045: fix crashes when changing URIs: When adding missing URIs in message, the "children" property was used instead of elements(). "children" not only return elements, and this was causing crashes. This may fix bug 294 rel 294
author Goffi <goffi@goffi.org>
date Sun, 30 Jun 2019 15:52:30 +0200
parents bad0b4280b77
children 86bfdf73d24a
files sat/core/xmpp.py sat/plugins/plugin_xep_0045.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/sat/core/xmpp.py	Sun Jun 30 15:52:27 2019 +0200
+++ b/sat/core/xmpp.py	Sun Jun 30 15:52:30 2019 +0200
@@ -969,7 +969,7 @@
         if message_elt.uri is None:
             # wokkel element parsing strip out root namespace
             message_elt.defaultUri = message_elt.uri = C.NS_CLIENT
-            for c in message_elt.children:
+            for c in message_elt.elements():
                 if c.uri is None:
                     c.uri == C.NS_CLIENT
         elif message_elt.uri != C.NS_CLIENT:
--- a/sat/plugins/plugin_xep_0045.py	Sun Jun 30 15:52:27 2019 +0200
+++ b/sat/plugins/plugin_xep_0045.py	Sun Jun 30 15:52:30 2019 +0200
@@ -1192,7 +1192,7 @@
                 #      unexpected <delay> elements which break our workflow.
                 log.warning(_(u"storing the unexpected message anyway, to avoid loss"))
                 # we have to restore URI which are stripped by wokkel parsing
-                for c in message.element.children:
+                for c in message.element.elements():
                     if c.uri is None:
                         c.uri = C.NS_CLIENT
                 mess_data = self.client.messageProt.parseMessage(message.element)