leptris 1.9.232.0-arm-linux → 1.9.237.0-arm-linux

data/vendor-src/libleptris/src/leptris/xpath/xpath_public.c

@@ -397,7 +397,11 @@ LEPTRIS_API const char* leptris_xpath_result_node_value(
          * per-member type checks — never show it to public
          * consumers. */
         if (text->content && text->content[0] == '\x03' &&
-            text->content[1] == 'N')
+            (text->content[1] == 'N' || text->content[1] == 'B' ||
+             text->content[1] == 'D' ||
+             (text->content[1] == 'F' &&
+              !((text->content[2] == 'N' && text->content[3] == '\x02') ||
+                text->content[2] == 'R'))))
             return text->content + 2;
         return text->content;
     }
@@ -415,6 +419,17 @@ LEPTRIS_API int leptris_xpath_result_boolean(LeptrisXPathResult result) {
         case XPATH_RESULT_STRING:
             return (result->value.string_value && result->value.string_value[0] != '\0') ? 1 : 0;
         case XPATH_RESULT_NODESET:
+            if (result->value.nodeset_value &&
+                result->value.nodeset_value->count == 1) {
+                void* nd = result->value.nodeset_value->nodes[0];
+                if (nd && (int)XPATH_NODE_TYPE(nd) == (int)LEPTRIS_NODE_TEXT) {
+                    XPathTextNode* tn = (XPathTextNode*)nd;
+                    /* "\x03B" boolean members carry their EBV */
+                    if (tn->content && tn->content[0] == '\x03' &&
+                        tn->content[1] == 'B')
+                        return tn->content[2] == 't';
+                }
+            }
             return (result->value.nodeset_value && result->value.nodeset_value->count > 0) ? 1 : 0;
         default:
             return 0;

data/vendor-src/libleptris/test/dom/test_dom.cpp

@@ -2616,3 +2616,83 @@ TEST(AttributePairs, BulkReadReturnsNamesValuesAndHandles) {
               0u);
     leptris_document_free(doc);
 }
+
+/* #1344: single-crossing element construction — the fused
+ * create + N x set_attribute entry for builder paths. */
+TEST(ElementNewWithAttributes, CreatesElementWithAllAttributes) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisDocument doc = leptris_parse_string("<r/>", 4, &st);
+    ASSERT_NE(doc, nullptr);
+    const char* names[] = {"id", "class"};
+    const char* values[] = {"7", "c"};
+    LeptrisElement e = leptris_element_new_with_attributes(
+        doc, "book", names, values, 2);
+    ASSERT_NE(e, nullptr);
+    EXPECT_STREQ(leptris_element_name(e), "book");
+    EXPECT_EQ(leptris_element_attribute_count(e), 2u);
+    EXPECT_STREQ(leptris_element_attribute(e, "id"), "7");
+    EXPECT_STREQ(leptris_element_attribute(e, "class"), "c");
+    leptris_document_free(doc);
+}
+
+TEST(ElementNewWithAttributes, ZeroAttributesMakesPlainElement) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisDocument doc = leptris_parse_string("<r/>", 4, &st);
+    ASSERT_NE(doc, nullptr);
+    LeptrisElement e = leptris_element_new_with_attributes(doc, "leaf",
+                                                           NULL, NULL, 0);
+    ASSERT_NE(e, nullptr);
+    EXPECT_STREQ(leptris_element_name(e), "leaf");
+    EXPECT_EQ(leptris_element_attribute_count(e), 0u);
+    leptris_document_free(doc);
+}
+
+TEST(ElementNewWithAttributes, InvalidArgsReturnNull) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisDocument doc = leptris_parse_string("<r/>", 4, &st);
+    ASSERT_NE(doc, nullptr);
+    const char* names[] = {"id"};
+    const char* values[] = {"1"};
+    EXPECT_EQ(leptris_element_new_with_attributes(NULL, "a", names,
+                                                  values, 1),
+              nullptr);
+    EXPECT_EQ(leptris_element_new_with_attributes(doc, NULL, names,
+                                                  values, 1),
+              nullptr);
+    EXPECT_EQ(leptris_element_new_with_attributes(doc, "a", NULL, values,
+                                                  1),
+              nullptr);
+    leptris_document_free(doc);
+}
+
+TEST(ElementNewWithAttributes, SerializesLikeSetAttributePath) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisDocument doc = leptris_parse_string("<r/>", 4, &st);
+    ASSERT_NE(doc, nullptr);
+    const char* names[] = {"id"};
+    const char* values[] = {"x&y"};
+    LeptrisElement e = leptris_element_new_with_attributes(
+        doc, "n", names, values, 1);
+    ASSERT_NE(e, nullptr);
+    LeptrisElement root = leptris_document_root(doc);
+    ASSERT_EQ(leptris_element_append_child(root, e), LEPTRIS_OK);
+    char* xml = leptris_document_serialize(doc, nullptr);
+    ASSERT_NE(xml, nullptr);
+    EXPECT_STREQ(xml, "<r><n id=\"x&amp;y\"/></r>");
+    leptris_free_string(xml);
+    leptris_document_free(doc);
+}
+
+TEST(ElementNewWithAttributes, DuplicateNamesReplaceLastWins) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisDocument doc = leptris_parse_string("<r/>", 4, &st);
+    ASSERT_NE(doc, nullptr);
+    const char* names[] = {"id", "id"};
+    const char* values[] = {"first", "second"};
+    LeptrisElement e = leptris_element_new_with_attributes(
+        doc, "n", names, values, 2);
+    ASSERT_NE(e, nullptr);
+    EXPECT_EQ(leptris_element_attribute_count(e), 1u);
+    EXPECT_STREQ(leptris_element_attribute(e, "id"), "second");
+    leptris_document_free(doc);
+}