zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-951772 into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  William Candillon (wcandillon)
Related bugs:
  Bug #951772 in Zorba: "Comment node crashes serialization"
  https://bugs.launchpad.net/zorba/+bug/951772

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-951772/+merge/96910

fixed bug #951772 Comment node crashes serialization)
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-951772/+merge/96910
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-09 22:12:26 +0000
+++ ChangeLog	2012-03-11 03:27:21 +0000
@@ -23,6 +23,7 @@
   * Types-related optimizations for runtime operators (comparisons, FnBoolean, Or, And,
     Compare, instance-of, cast, castable, treat, promote).
   * Fixed bug #911585 (management of variables during eval)
+  * Fixed bug #951772 (Comment node crashes serialization)
   * Fixed bug #866423 (fn:empty and fn:exists iterators must reset their input in
     case of early-out)
   * More efficient implementation for base64Binary items

=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2012-02-02 09:56:52 +0000
+++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2012-03-11 03:27:21 +0000
@@ -202,6 +202,11 @@
         if (lChildElem->isNode() && lChildElem->getNodeKind() == store::StoreConsts::elementNode)
         {
 #endif
+          if (lChildElem->getNodeKind() != store::StoreConsts::elementNode)
+          {
+            continue;
+          }
+
           store::Item_t lChildName = lChildElem->getNodeName();
           if (lChildName->getLocalName() == "use-character-maps")
           {