Fix segfault when tests fail.
authorCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 10:16:25 +0000 (11:16 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 10:16:25 +0000 (11:16 +0100)
test/test.cc

index c233a661ddf4666cb65bd89c68a413d44950fcdb..983ad852b95cfb6d4524c68ce986e496fe4aaacc 100644 (file)
@@ -182,7 +182,7 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 
        xmlpp::Element::NodeList::iterator k = ref_children.begin ();
        xmlpp::Element::NodeList::iterator l = test_children.begin ();
-       while (k != ref_children.end ()) {
+       while (k != ref_children.end () && l != test_children.end ()) {
                
                /* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
 
@@ -211,6 +211,9 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
                ++k;
                ++l;
        }
+
+       BOOST_CHECK (k == ref_children.end ());
+       BOOST_CHECK (l == test_children.end ());
 }
 
 void