From 83458833c3a337e5b4314ba050ded1ab5bfbaeb9 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 7 Oct 2011 10:17:35 +0200
Subject: [PATCH] don't traceback when securitylabel has no displaymarking
element. Fixes #7006
---
src/common/connection_handlers.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index c4dc05a862..1117de3480 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1417,7 +1417,11 @@ ConnectionJingle, ConnectionIBBytestream):
labels = {}
ll = []
for item in items:
- label = item.getTag('displaymarking').getData()
+ display_tag = item.getTag('displaymarking')
+ if display_tag:
+ label = display_tag.getData()
+ else:
+ label = ''
labels[label] = item
ll.append(label)
if to not in self.seclabel_catalogues:
--
GitLab