Merge branch 'zeux:master' into master

Author: Treata11

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
     name: ${{matrix.os}} (${{matrix.compiler}}, ${{matrix.defines}})
     runs-on: ${{matrix.os}}-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: make test
       run: |
         export CXX=${{matrix.compiler}}
@@ -41,7 +41,7 @@ jobs:
     name: ${{matrix.os}} cmake
     runs-on: ${{matrix.os}}-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: cmake configure
       run: |
         mkdir cmake && cd cmake
@@ -57,7 +57,7 @@ jobs:
         arch: [Win32, x64]
         defines: [standard, PUGIXML_WCHAR_MODE, PUGIXML_COMPACT, PUGIXML_NO_EXCEPTIONS]
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: cmake configure
       run: cmake . -DPUGIXML_BUILD_TESTS=ON -D${{matrix.defines}}=ON -A ${{matrix.arch}}
     - name: cmake test

.github/workflows/cifuzz.yml

@@ -17,7 +17,7 @@ jobs:
         fuzz-seconds: 30
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

README.md

@@ -70,3 +70,12 @@ int main()
 ## License
 
 This library is available to anybody free of charge, under the terms of MIT License (see LICENSE.md).
+
+This work is based on the pugxml parser, which carried the following Public Domain dedication:
+
+    // Pug XML Parser - Version 1.0002
+    // --------------------------------------------------------
+    // Copyright (C) 2003, by Kristen Wegner ([email protected])
+    // Released into the Public Domain. Use at your own risk.
+    // See pugxml.xml for further information, history, etc.
+    // Contributions by Neville Franks ([email protected]).

docs/manual.adoc

@@ -251,7 +251,7 @@ NOTE: In that example `PUGIXML_API` is inconsistent between several source files
 
 pugixml is written in standard-compliant C{plus}{plus} with some compiler-specific workarounds where appropriate. pugixml is compatible with the C{plus}{plus}11 standard, but does not require C{plus}{plus}11 support. Each version is tested with a unit test suite with code coverage exceeding 99%.
 
-pugixml runs on a variety of desktop platforms (including Microsoft Windows, Linux, FreeBSD, Apple MacOSX and Sun Solaris), game consoles (inclusing Microsoft Xbox 360, Microsoft Xbox One, Nintendo Wii, Sony Playstation Portable and Sony Playstation 3) and mobile platforms (including Android, iOS, BlackBerry, Samsung bada and Microsoft Windows CE).
+pugixml runs on a variety of desktop platforms (including Microsoft Windows, Linux, FreeBSD, Apple MacOSX and Sun Solaris), game consoles (including Microsoft Xbox 360, Microsoft Xbox One, Nintendo Wii, Sony Playstation Portable and Sony Playstation 3) and mobile platforms (including Android, iOS, BlackBerry, Samsung bada and Microsoft Windows CE).
 
 pugixml supports various architectures, such as x86/x86-64, PowerPC, ARM, MIPS and SPARC. In general it should run on any architecture since it does not use architecture-specific code and does not rely on features such as unaligned memory access.
 

docs/manual.html

@@ -1038,7 +1038,7 @@ <h3 id="install.portability"><a class="anchor" href="#install.portability"></a><
 <p>pugixml is written in standard-compliant C&#43;&#43; with some compiler-specific workarounds where appropriate. pugixml is compatible with the C&#43;&#43;11 standard, but does not require C&#43;&#43;11 support. Each version is tested with a unit test suite with code coverage exceeding 99%.</p>
 </div>
 <div class="paragraph">
-<p>pugixml runs on a variety of desktop platforms (including Microsoft Windows, Linux, FreeBSD, Apple MacOSX and Sun Solaris), game consoles (inclusing Microsoft Xbox 360, Microsoft Xbox One, Nintendo Wii, Sony Playstation Portable and Sony Playstation 3) and mobile platforms (including Android, iOS, BlackBerry, Samsung bada and Microsoft Windows CE).</p>
+<p>pugixml runs on a variety of desktop platforms (including Microsoft Windows, Linux, FreeBSD, Apple MacOSX and Sun Solaris), game consoles (including Microsoft Xbox 360, Microsoft Xbox One, Nintendo Wii, Sony Playstation Portable and Sony Playstation 3) and mobile platforms (including Android, iOS, BlackBerry, Samsung bada and Microsoft Windows CE).</p>
 </div>
 <div class="paragraph">
 <p>pugixml supports various architectures, such as x86/x86-64, PowerPC, ARM, MIPS and SPARC. In general it should run on any architecture since it does not use architecture-specific code and does not rely on features such as unaligned memory access.</p>

src/pugiconfig.hpp

@@ -1,14 +1,12 @@
 /**
  * pugixml parser - version 1.15
  * --------------------------------------------------------
- * Copyright (C) 2006-2025, by Arseny Kapoulkine ([email protected])
  * Report bugs and download new versions at https://pugixml.org/
  *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
+ * SPDX-FileCopyrightText: Copyright (C) 2006-2025, by Arseny Kapoulkine ([email protected])
+ * SPDX-License-Identifier: MIT
  *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner ([email protected])
+ * See LICENSE.md or notice at the end of this file.
  */
 
 #ifndef HEADER_PUGICONFIG_HPP

src/pugixml.cpp

@@ -1,14 +1,12 @@
 /**
  * pugixml parser - version 1.15
  * --------------------------------------------------------
- * Copyright (C) 2006-2025, by Arseny Kapoulkine ([email protected])
  * Report bugs and download new versions at https://pugixml.org/
  *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
+ * SPDX-FileCopyrightText: Copyright (C) 2006-2025, by Arseny Kapoulkine ([email protected])
+ * SPDX-License-Identifier: MIT
  *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner ([email protected])
+ * See LICENSE.md or notice at the end of this file.
  */
 
 #ifndef SOURCE_PUGIXML_CPP
@@ -264,7 +262,7 @@ PUGI_IMPL_NS_BEGIN
 
 		while (srclen && *dst && *src == *dst)
 		{
-			--srclen; ++dst; ++src; 
+			--srclen; ++dst; ++src;
 		}
 		return srclen == 0 && *dst == 0;
 	}
@@ -4780,11 +4778,13 @@ PUGI_IMPL_NS_BEGIN
 		// if convert_buffer below throws bad_alloc, we still need to deallocate contents if we own it
 		auto_deleter<void> contents_guard(own ? contents : NULL, xml_memory::deallocate);
 
+		// early-out for empty documents to avoid buffer allocation overhead
+		if (size == 0) return make_parse_result((options & parse_fragment) ? status_ok : status_no_document_element);
+
 		// get private buffer
 		char_t* buffer = NULL;
 		size_t length = 0;
 
-		// coverity[var_deref_model]
 		if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory);
 
 		// after this we either deallocate contents (below) or hold on to it via doc->buffer, so we don't need to guard it
@@ -9516,10 +9516,10 @@ PUGI_IMPL_NS_BEGIN
 				size_t hash_size = 1;
 				while (hash_size < size_ + size_ / 2) hash_size *= 2;
 
-				const void** hash_data = static_cast<const void**>(alloc->allocate(hash_size * sizeof(void**)));
+				const void** hash_data = static_cast<const void**>(alloc->allocate(hash_size * sizeof(void*)));
 				if (!hash_data) return;
 
-				memset(hash_data, 0, hash_size * sizeof(const void**));
+				memset(hash_data, 0, hash_size * sizeof(void*));
 
 				xpath_node* write = _begin;
 
@@ -13100,8 +13100,11 @@ namespace pugi
 
 		// look for existing variable
 		for (xpath_variable* var = _data[hash]; var; var = var->_next)
-			if (impl::strequal(var->name(), name))
+		{
+			const char_t* vn = var->name();
+			if (vn && impl::strequal(vn, name))
 				return var;
+		}
 
 		return NULL;
 	}
@@ -13152,8 +13155,11 @@ namespace pugi
 
 		// look for existing variable
 		for (xpath_variable* var = _data[hash]; var; var = var->_next)
-			if (impl::strequal(var->name(), name))
+		{
+			const char_t* vn = var->name();
+			if (vn && impl::strequal(vn, name))
 				return var->type() == type ? var : NULL;
+		}
 
 		// add new variable
 		xpath_variable* result = impl::new_xpath_variable(type, name);

src/pugixml.hpp

@@ -1,14 +1,12 @@
 /**
  * pugixml parser - version 1.15
  * --------------------------------------------------------
- * Copyright (C) 2006-2025, by Arseny Kapoulkine ([email protected])
  * Report bugs and download new versions at https://pugixml.org/
  *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
+ * SPDX-FileCopyrightText: Copyright (C) 2006-2025, by Arseny Kapoulkine ([email protected])
+ * SPDX-License-Identifier: MIT
  *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner ([email protected])
+ * See LICENSE.md or notice at the end of this file.
  */
 
 // Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons

tests/test_document.cpp

@@ -473,6 +473,17 @@ TEST(document_load_string)
 	CHECK_NODE(doc, STR("<node/>"));
 }
 
+TEST(document_load_string_empty)
+{
+	xml_document doc;
+
+	CHECK(doc.load_string(STR("")).status == status_no_document_element);
+	CHECK(!doc.first_child());
+
+	CHECK(doc.load_string(STR(""), parse_fragment));
+	CHECK(!doc.first_child());
+}
+
 TEST(document_load_file)
 {
 	xml_document doc;
@@ -864,6 +875,19 @@ TEST(document_load_buffer_inplace_own)
 	CHECK_NODE(doc, STR("<node/>"));
 }
 
+TEST(document_load_buffer_inplace_own_empty)
+{
+	allocation_function alloc = get_memory_allocation_function();
+
+	void* text1 = alloc(1);
+	void* text2 = alloc(1);
+	CHECK(text1 && text2);
+
+	xml_document doc;
+	CHECK(doc.load_buffer_inplace_own(text1, 0, parse_fragment));
+	CHECK(doc.load_buffer_inplace_own(text2, 0).status == status_no_document_element);
+}
+
 TEST(document_parse_result_bool)
 {
 	xml_parse_result result;

tests/test_dom_traverse.cpp

@@ -896,7 +896,7 @@ struct test_walker: xml_tree_walker
 	#endif
 	}
 
-	virtual bool begin(xml_node& node) PUGIXML_OVERRIDE
+	bool begin(xml_node& node) PUGIXML_OVERRIDE
 	{
 		log += STR("|");
 		log += depthstr();
@@ -908,7 +908,7 @@ struct test_walker: xml_tree_walker
 		return ++call_count != stop_count && xml_tree_walker::begin(node);
 	}
 
-	virtual bool for_each(xml_node& node) PUGIXML_OVERRIDE
+	bool for_each(xml_node& node) PUGIXML_OVERRIDE
 	{
 		log += STR("|");
 		log += depthstr();
@@ -920,7 +920,7 @@ struct test_walker: xml_tree_walker
 		return ++call_count != stop_count && xml_tree_walker::end(node);
 	}
 
-	virtual bool end(xml_node& node) PUGIXML_OVERRIDE
+	bool end(xml_node& node) PUGIXML_OVERRIDE
 	{
 		log += STR("|");
 		log += depthstr();

tests/test_write.cpp

@@ -237,7 +237,7 @@ struct test_writer: xml_writer
 {
 	std::basic_string<char_t> contents;
 
-	virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE
+	void write(const void* data, size_t size) PUGIXML_OVERRIDE
 	{
 		CHECK(size % sizeof(char_t) == 0);
 		contents.append(static_cast<const char_t*>(data), size / sizeof(char_t));
@@ -687,7 +687,7 @@ TEST(write_flush_coverage)
 #ifndef PUGIXML_NO_EXCEPTIONS
 struct throwing_writer: xml_writer
 {
-	virtual void write(const void*, size_t) PUGIXML_OVERRIDE
+	void write(const void*, size_t) PUGIXML_OVERRIDE
 	{
 		throw std::runtime_error("write failed");
 	}