gajim: prevent traceback. Fixes #7503

2013-12-30 Thread Gajim 
changeset 6a3beba4693b in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gtk3
details:http://hg.gajim.org/gajim?cmd=changeset;node=6a3beba4693b
description: prevent traceback. Fixes #7503

diffstat:

 src/common/stanza_session.py |  10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 18b184cfb517 -r 6a3beba4693b src/common/stanza_session.py
--- a/src/common/stanza_session.py  Wed Nov 06 19:02:37 2013 +0100
+++ b/src/common/stanza_session.py  Wed Nov 06 21:17:15 2013 +0100
@@ -810,7 +810,10 @@
 
 # the offset of the group we chose (need it to match up with the 
dhhash)
 group_order = 0
-self.modp = int(form.getField('modp').getOptions()[group_order][1])
+modp_f = form.getField('modp')
+if not modp_f:
+return
+self.modp = int(modp_f.getOptions()[group_order][1])
 x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp))
 
 g = dh.generators[self.modp]
@@ -818,7 +821,10 @@
 
 self.n_o = base64.b64decode(form['my_nonce'])
 
-dhhashes = form.getField('dhhashes').getValues()
+dhhashes_f = form.getField('dhhashes')
+if not dhhashes_f:
+return
+dhhashes = dhhashes_f.getValues()
 self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode(
 'utf8'))
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7503

2013-11-06 Thread Gajim 
changeset c8d945a5b22f in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=c8d945a5b22f
description: prevent traceback. Fixes #7503

diffstat:

 src/common/stanza_session.py |  10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 80b6bc2509b8 -r c8d945a5b22f src/common/stanza_session.py
--- a/src/common/stanza_session.py  Wed Nov 06 19:02:37 2013 +0100
+++ b/src/common/stanza_session.py  Wed Nov 06 21:17:15 2013 +0100
@@ -810,7 +810,10 @@
 
 # the offset of the group we chose (need it to match up with the 
dhhash)
 group_order = 0
-self.modp = int(form.getField('modp').getOptions()[group_order][1])
+modp_f = form.getField('modp')
+if not modp_f:
+return
+self.modp = int(modp_f.getOptions()[group_order][1])
 x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp))
 
 g = dh.generators[self.modp]
@@ -818,7 +821,10 @@
 
 self.n_o = base64.b64decode(form['my_nonce'])
 
-dhhashes = form.getField('dhhashes').getValues()
+dhhashes_f = form.getField('dhhashes')
+if not dhhashes_f:
+return
+dhhashes = dhhashes_f.getValues()
 self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode(
 'utf8'))
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits