2 files changed, 58 insertions, 1 deletions
diff --git a/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp b/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp
index 1897080..58b0af0 100644
--- a/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp
+++ b/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp
@@ -36,3 +36,3 @@ void SecurityLabelsCatalogParser::handleStartElement(const std::string& element,
     }
-    else if (level_ == LabelLevel) {
+    else if (level_ == LabelLevel && currentItem_) {
         assert(!labelParser_);
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp
index 2b992b1..ee7668c 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp
@@ -18,2 +18,3 @@ class SecurityLabelsCatalogParserTest : public CppUnit::TestFixture
         CPPUNIT_TEST(testParse);
+        CPPUNIT_TEST(testParseInvalidInput);
         CPPUNIT_TEST_SUITE_END();
@@ -48,2 +49,3 @@ class SecurityLabelsCatalogParserTest : public CppUnit::TestFixture
             CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(payload->getItems().size()));
+
             CPPUNIT_ASSERT_EQUAL(std::string("SECRET"), payload->getItems()[0].getLabel()->getDisplayMarking());
@@ -60,2 +62,57 @@ class SecurityLabelsCatalogParserTest : public CppUnit::TestFixture
         }
+
+        void testParseInvalidInput() {
+            PayloadsParserTester parser;
+
+            CPPUNIT_ASSERT(parser.parse(
+                "<catalog desc=\"an example set of labels\" name=\"Default\" to=\"example.com\" xmlns=\"urn:xmpp:sec-label:catalog:2\">"
+                 "<item selector='Classified|INVALID-SECRET' xmlns=\"\">"
+                     "<securitylabel xmlns=\"urn:xmpp:sec-label:0\">"
+                         "<displaymarking bgcolor=\"red\" fgcolor=\"black\">INVALID-SECRET</displaymarking>"
+                         "<label><esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQYCAQQGASk=</esssecuritylabel></label>"
+                     "</securitylabel>"
+                 "</item>"
+                 "<item selector='Classified|INVALID-TOPSECRET' xmlns=\"urn:xmpp:sec-label:catalog:invalid:2\">"
+                    "<securitylabel xmlns=\"urn:xmpp:sec-label:0\">"
+                        "<displaymarking bgcolor=\"red\" fgcolor=\"black\">INVALID-TOPSECRET</displaymarking>"
+                        "<label><esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQYCAQQGASk=</esssecuritylabel></label>"
+                    "</securitylabel>"
+                 "</item>"
+                 "<item selector='Classified|CONFIDENTIAL' default='true' xmlns=\"urn:xmpp:sec-label:catalog:2\">"
+                     "<securitylabel xmlns=\"urn:xmpp:sec-label:0\">"
+                         "<displaymarking bgcolor=\"navy\" fgcolor=\"black\">CONFIDENTIAL</displaymarking>"
+                         "<label><esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQMGASk=</esssecuritylabel></label>"
+                     "</securitylabel>"
+                 "</item>"
+                 "<item selector='Classified|INVALID-LABEL'>"
+                     "<securitylabel xmlns=\"\">"
+                         "<displaymarking bgcolor=\"yellow\" fgcolor=\"black\">INVALID</displaymarking>"
+                         "<label><esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQYCAQQGASk=</esssecuritylabel></label>"
+                     "</securitylabel>"
+                 "</item>"
+                 "<item selector='Unclassified|UNCLASSIFIED'/>"
+                "</catalog>"));
+
+            SecurityLabelsCatalog* payload = dynamic_cast<SecurityLabelsCatalog*>(parser.getPayload().get());
+            CPPUNIT_ASSERT_EQUAL(std::string("Default"), payload->getName());
+            CPPUNIT_ASSERT_EQUAL(std::string("an example set of labels"), payload->getDescription());
+            CPPUNIT_ASSERT_EQUAL(JID("example.com"), payload->getTo());
+            CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(payload->getItems().size()));
+
+            CPPUNIT_ASSERT(payload->getItems()[0].getLabel());
+            if (payload->getItems()[0].getLabel()) {
+                CPPUNIT_ASSERT_EQUAL(std::string("CONFIDENTIAL"), payload->getItems()[0].getLabel()->getDisplayMarking());
+                CPPUNIT_ASSERT_EQUAL(std::string("<esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQMGASk=</esssecuritylabel>"), payload->getItems()[0].getLabel()->getLabel());
+                CPPUNIT_ASSERT_EQUAL(true, payload->getItems()[0].getIsDefault());
+                CPPUNIT_ASSERT_EQUAL(std::string("Classified|CONFIDENTIAL"), payload->getItems()[0].getSelector());
+            }
+            //The label is invalid, but the rest of the item entry should be there.
+            CPPUNIT_ASSERT(!payload->getItems()[1].getLabel());
+            CPPUNIT_ASSERT_EQUAL(false, payload->getItems()[1].getIsDefault());
+            CPPUNIT_ASSERT_EQUAL(std::string("Classified|INVALID-LABEL"), payload->getItems()[1].getSelector());
+            CPPUNIT_ASSERT_EQUAL(false, payload->getItems()[2].getIsDefault());
+            CPPUNIT_ASSERT_EQUAL(std::string("Unclassified|UNCLASSIFIED"), payload->getItems()[2].getSelector());
+            CPPUNIT_ASSERT(!payload->getItems()[2].getLabel());
+        }
+
 };