remove the c code path

Merge branch 'MattHuangGarmin-master' into leethomason/fallthrough
move to cpp file
2026-07-22 19:52:59 +04:00 · 2025-11-22 15:59:12 -08:00 · 2025-11-22 15:47:41 -08:00 · 2025-11-22 15:46:45 -08:00 · 2025-11-22 15:44:05 -08:00 · 2025-11-22 15:38:08 -08:00
11 changed files with 263 additions and 182 deletions
@@ -6,15 +6,15 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ windows-2019, macos-latest, ubuntu-20.04 ]
+        os: [ windows-latest, macos-latest, ubuntu-latest ]
        cmake: [ 3.15, 3.x ]
        include:
-          - os: windows-2019
+          - os: windows-latest
            static_postfix: _static
            tree: tree /F
            CXX: cl

-          - os: ubuntu-20.04
+          - os: ubuntu-latest
            tree: tree

          - os: macos-latest
@@ -31,10 +31,10 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
      # System set-up
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: ilammy/msvc-dev-cmd@v1
-      - uses: seanmiddleditch/gha-setup-ninja@master
-      - uses: jwlawson/actions-setup-cmake@v1.8
+      - uses: seanmiddleditch/gha-setup-ninja@v4
+      - uses: jwlawson/actions-setup-cmake@v2
        with:
          cmake-version: ${{ matrix.cmake }}

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(tinyxml2 VERSION 10.0.0)
+project(tinyxml2 VERSION 11.0.0)

 include(CTest)
 option(tinyxml2_BUILD_TESTING "Build tests for tinyxml2" "${BUILD_TESTING}")
@@ -63,7 +63,9 @@ endif ()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)

-## Custom locations
+## Custom settings
+option(tinyxml2_INSTALL_PKGCONFIG "Create and install pkgconfig files" ON)
+
 set(tinyxml2_INSTALL_PKGCONFIGDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
    CACHE PATH "Directory for pkgconfig files")

@@ -121,10 +123,12 @@ install(

 ## pkg-config

-configure_file(cmake/tinyxml2.pc.in tinyxml2.pc.gen @ONLY)
-file(GENERATE OUTPUT tinyxml2.pc INPUT "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc.gen")
-install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc"
-    DESTINATION "${tinyxml2_INSTALL_PKGCONFIGDIR}"
-    COMPONENT tinyxml2_development
-)
+if (tinyxml2_INSTALL_PKGCONFIG)
+    configure_file(cmake/tinyxml2.pc.in tinyxml2.pc.gen @ONLY)
+    file(GENERATE OUTPUT tinyxml2.pc INPUT "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc.gen")
+    install(
+        FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc"
+        DESTINATION "${tinyxml2_INSTALL_PKGCONFIGDIR}"
+        COMPONENT tinyxml2_development
+    )
+endif ()
@@ -7,7 +7,7 @@

 //  In HTML5, there are 16 so-called "void" elements.  "void elements" NEVER have
 //  inner content (but they MAY have attributes), and are assumed to be self-closing.
-//  An example of a self-closig HTML5 element is "<br/>" (line break)
+//  An example of a self-closing HTML5 element is "<br/>" (line break)
 //  All other elements are called "non-void" and MUST never self-close.
 //  Examples: "<div class='lolcats'></div>".

@@ -38,7 +38,7 @@ PROJECT_NAME           = "TinyXML-2"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER = 10.0.0
+PROJECT_NUMBER = 11.0.0

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -22,7 +22,7 @@
 project(
    'tinyxml2',
    ['cpp'],
-    version : '10.0.0',
+    version : '11.0.0',
    meson_version : '>= 0.49.0',
 )

@@ -24,7 +24,7 @@ distribution.
 #include "tinyxml2.h"

 #include <new>		// yes, this one new style header, is in the Android SDK.
-#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__)
+#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) || defined(__CC_ARM)
 #   include <stddef.h>
 #   include <stdarg.h>
 #else
@@ -32,6 +32,27 @@ distribution.
 #   include <cstdarg>
 #endif

+// Handle fallthrough attribute for different compilers
+#ifndef __has_attribute
+#   define __has_attribute(x) 0
+#endif
+#ifndef __has_cpp_attribute
+#  define __has_cpp_attribute(x) 0
+#endif
+
+#if defined(_MSC_VER)
+#   define TIXML_FALLTHROUGH (void(0))
+#elif (__cplusplus >= 201703L && __has_cpp_attribute(fallthrough))
+#   define TIXML_FALLTHROUGH [[fallthrough]]
+#elif __has_cpp_attribute(clang::fallthrough)
+#   define TIXML_FALLTHROUGH [[clang::fallthrough]]
+#elif __has_attribute(fallthrough)
+#   define TIXML_FALLTHROUGH __attribute__((fallthrough))
+#else
+#   define TIXML_FALLTHROUGH (void(0))
+#endif
+
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE)
 	// Microsoft Visual Studio, version 2005 and higher. Not WinCE.
 	/*int _snprintf_s(
@@ -106,14 +127,9 @@ distribution.
 #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
 	#define TIXML_FSEEK fseeko
 	#define TIXML_FTELL ftello
-#elif defined(__ANDROID__) 
-    #if __ANDROID_API__ > 24
-        #define TIXML_FSEEK fseeko64
-        #define TIXML_FTELL ftello64
-    #else
-        #define TIXML_FSEEK fseeko
-        #define TIXML_FTELL ftello
-    #endif
+#elif defined(__ANDROID__) && __ANDROID_API__ > 24
+	#define TIXML_FSEEK fseeko64
+	#define TIXML_FTELL ftello64
 #else
 	#define TIXML_FSEEK fseek
 	#define TIXML_FTELL ftell
@@ -239,13 +255,13 @@ char* StrPair::ParseName( char* p )
    if ( !p || !(*p) ) {
        return 0;
    }
-    if ( !XMLUtil::IsNameStartChar( (unsigned char) *p ) ) {
+    if ( !XMLUtil::IsNameStartChar( static_cast<unsigned char>(*p) ) ) {
        return 0;
    }

    char* const start = p;
    ++p;
-    while ( *p && XMLUtil::IsNameChar( (unsigned char) *p ) ) {
+    while ( *p && XMLUtil::IsNameChar( static_cast<unsigned char>(*p) ) ) {
        ++p;
    }

@@ -451,17 +467,17 @@ void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length
            --output;
            *output = static_cast<char>((input | BYTE_MARK) & BYTE_MASK);
            input >>= 6;
-            //fall through
+            TIXML_FALLTHROUGH;
        case 3:
            --output;
            *output = static_cast<char>((input | BYTE_MARK) & BYTE_MASK);
            input >>= 6;
-            //fall through
+            TIXML_FALLTHROUGH;
        case 2:
            --output;
            *output = static_cast<char>((input | BYTE_MARK) & BYTE_MASK);
            input >>= 6;
-            //fall through
+            TIXML_FALLTHROUGH;
        case 1:
            --output;
            *output = static_cast<char>(input | FIRST_BYTE_MARK[*length]);
@@ -472,102 +488,94 @@ void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length
 }


-const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
+const char* XMLUtil::GetCharacterRef(const char* p, char* value, int* length)
 {
-    // Presume an entity, and pull it out.
+    // Assume an entity, and pull it out.
    *length = 0;

-    if ( *(p+1) == '#' && *(p+2) ) {
-        unsigned long ucs = 0;
-        TIXMLASSERT( sizeof( ucs ) >= 4 );
+    static const uint32_t MAX_CODE_POINT = 0x10FFFF;
+
+    if (*(p + 1) == '#' && *(p + 2)) {
+        uint32_t ucs = 0;
        ptrdiff_t delta = 0;
-        unsigned mult = 1;
+        uint32_t mult = 1;
        static const char SEMICOLON = ';';

-        if ( *(p+2) == 'x' ) {
+        bool hex = false;
+        uint32_t radix = 10;
+        const char* q = 0;
+        char terminator = '#';
+
+        if (*(p + 2) == 'x') {
            // Hexadecimal.
-            const char* q = p+3;
-            if ( !(*q) ) {
-                return 0;
-            }
+            hex = true;
+            radix = 16;
+            terminator = 'x';

-            q = strchr( q, SEMICOLON );
-
-            if ( !q ) {
-                return 0;
-            }
-            TIXMLASSERT( *q == SEMICOLON );
-
-            delta = q-p;
-            --q;
-
-            while ( *q != 'x' ) {
-                unsigned int digit = 0;
-
-                if ( *q >= '0' && *q <= '9' ) {
-                    digit = *q - '0';
-                }
-                else if ( *q >= 'a' && *q <= 'f' ) {
-                    digit = *q - 'a' + 10;
-                }
-                else if ( *q >= 'A' && *q <= 'F' ) {
-                    digit = *q - 'A' + 10;
-                }
-                else {
-                    return 0;
-                }
-                TIXMLASSERT( digit < 16 );
-                TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
-                const unsigned int digitScaled = mult * digit;
-                TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
-                ucs += digitScaled;
-                TIXMLASSERT( mult <= UINT_MAX / 16 );
-                mult *= 16;
-                --q;
-            }
+            q = p + 3;
        }
        else {
            // Decimal.
-            const char* q = p+2;
-            if ( !(*q) ) {
+            q = p + 2;
+        }
+        if (!(*q)) {
+            return 0;
+        }
+
+        q = strchr(q, SEMICOLON);
+        if (!q) {
+            return 0;
+        }
+        TIXMLASSERT(*q == SEMICOLON);
+
+        delta = q - p;
+        --q;
+
+        while (*q != terminator) {
+            uint32_t digit = 0;
+
+            if (*q >= '0' && *q <= '9') {
+                digit = *q - '0';
+            }
+            else if (hex && (*q >= 'a' && *q <= 'f')) {
+                digit = *q - 'a' + 10;
+            }
+            else if (hex && (*q >= 'A' && *q <= 'F')) {
+                digit = *q - 'A' + 10;
+            }
+            else {
                return 0;
            }
+            TIXMLASSERT(digit < radix);

-            q = strchr( q, SEMICOLON );
-
-            if ( !q ) {
-                return 0;
+            const unsigned int digitScaled = mult * digit;
+            ucs += digitScaled;
+            mult *= radix;       
+            
+            // Security check: could a value exist that is out of range?
+            // Easily; limit to the MAX_CODE_POINT, which also allows for a
+            // bunch of leading zeroes.
+            if (mult > MAX_CODE_POINT) {
+                mult = MAX_CODE_POINT;
            }
-            TIXMLASSERT( *q == SEMICOLON );
-
-            delta = q-p;
            --q;
-
-            while ( *q != '#' ) {
-                if ( *q >= '0' && *q <= '9' ) {
-                    const unsigned int digit = *q - '0';
-                    TIXMLASSERT( digit < 10 );
-                    TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
-                    const unsigned int digitScaled = mult * digit;
-                    TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
-                    ucs += digitScaled;
-                }
-                else {
-                    return 0;
-                }
-                TIXMLASSERT( mult <= UINT_MAX / 10 );
-                mult *= 10;
-                --q;
-            }
+        }
+        // Out of range:
+        if (ucs > MAX_CODE_POINT) {
+            return 0;
        }
        // convert the UCS to UTF-8
-        ConvertUTF32ToUTF8( ucs, value, length );
+        ConvertUTF32ToUTF8(ucs, value, length);
+		if (length == 0) {
+            // If length is 0, there was an error. (Security? Bad input?)
+            // Fail safely.
+			return 0;
+		}
        return p + delta + 1;
    }
-    return p+1;
+    return p + 1;
 }

-
 void XMLUtil::ToStr( int v, char* buffer, int bufferSize )
 {
    TIXML_SNPRINTF( buffer, bufferSize, "%d", v );
@@ -610,7 +618,7 @@ void XMLUtil::ToStr( int64_t v, char* buffer, int bufferSize )
 void XMLUtil::ToStr( uint64_t v, char* buffer, int bufferSize )
 {
    // horrible syntax trick to make the compiler happy about %llu
-    TIXML_SNPRINTF(buffer, bufferSize, "%llu", (long long)v);
+    TIXML_SNPRINTF(buffer, bufferSize, "%llu", static_cast<unsigned long long>(v));
 }

 bool XMLUtil::ToInt(const char* str, int* value)
@@ -705,7 +713,7 @@ bool XMLUtil::ToInt64(const char* str, int64_t* value)
 bool XMLUtil::ToUnsigned64(const char* str, uint64_t* value) {
    unsigned long long v = 0;	// horrible syntax trick to make the compiler happy about %llu
    if(TIXML_SSCANF(str, IsPrefixHex(str) ? "%llx" : "%llu", &v) == 1) {
-        *value = (uint64_t)v;
+        *value = static_cast<uint64_t>(v);
        return true;
    }
    return false;
@@ -1982,7 +1990,7 @@ char* XMLElement::ParseAttributes( char* p, int* curLineNumPtr )
        }

        // attribute.
-        if (XMLUtil::IsNameStartChar( (unsigned char) *p ) ) {
+        if (XMLUtil::IsNameStartChar( static_cast<unsigned char>(*p) ) ) {
            XMLAttribute* attrib = CreateAttribute();
            TIXMLASSERT( attrib );
            attrib->_parseLineNum = _document->_parseCurLineNum;
@@ -2226,7 +2234,7 @@ void XMLDocument::MarkInUse(const XMLNode* const node)
 	TIXMLASSERT(node);
 	TIXMLASSERT(node->_parent == 0);

-	for (int i = 0; i < _unlinked.Size(); ++i) {
+	for (size_t i = 0; i < _unlinked.Size(); ++i) {
 		if (node == _unlinked[i]) {
 			_unlinked.SwapRemove(i);
 			break;
@@ -2590,7 +2598,7 @@ void XMLDocument::PopDepth()
 	--_parsingDepth;
 }

-XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
+XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth, EscapeAposCharsInAttributes aposInAttributes ) :
    _elementJustOpened( false ),
    _stack(),
    _firstElement( true ),
@@ -2607,9 +2615,11 @@ XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
    }
    for( int i=0; i<NUM_ENTITIES; ++i ) {
        const char entityValue = entities[i].value;
-        const unsigned char flagIndex = static_cast<unsigned char>(entityValue);
-        TIXMLASSERT( flagIndex < ENTITY_RANGE );
-        _entityFlag[flagIndex] = true;
+        if ((aposInAttributes == ESCAPE_APOS_CHARS_IN_ATTRIBUTES) || (entityValue != SINGLE_QUOTE)) {
+            const unsigned char flagIndex = static_cast<unsigned char>(entityValue);
+            TIXMLASSERT( flagIndex < ENTITY_RANGE );
+            _entityFlag[flagIndex] = true;
+        }
    }
    _restrictedEntityFlag[static_cast<unsigned char>('&')] = true;
    _restrictedEntityFlag[static_cast<unsigned char>('<')] = true;
@@ -96,11 +96,11 @@ distribution.
 /* Versioning, past 1.0.14:
 	http://semver.org/
 */
-static const int TIXML2_MAJOR_VERSION = 10;
+static const int TIXML2_MAJOR_VERSION = 11;
 static const int TIXML2_MINOR_VERSION = 0;
 static const int TIXML2_PATCH_VERSION = 0;

-#define TINYXML2_MAJOR_VERSION 10
+#define TINYXML2_MAJOR_VERSION 11
 #define TINYXML2_MINOR_VERSION 0
 #define TINYXML2_PATCH_VERSION 0

@@ -199,7 +199,7 @@ private:
 	Has a small initial memory pool, so that low or no usage will not
 	cause a call to new/delete
 */
-template <class T, int INITIAL_SIZE>
+template <class T, size_t INITIAL_SIZE>
 class DynArray
 {
 public:
@@ -227,9 +227,8 @@ public:
        ++_size;
    }

-    T* PushArr( int count ) {
-        TIXMLASSERT( count >= 0 );
-        TIXMLASSERT( _size <= INT_MAX - count );
+    T* PushArr( size_t count ) {
+        TIXMLASSERT( _size <= SIZE_MAX - count );
        EnsureCapacity( _size+count );
        T* ret = &_mem[_size];
        _size += count;
@@ -242,7 +241,7 @@ public:
        return _mem[_size];
    }

-    void PopArr( int count ) {
+    void PopArr( size_t count ) {
        TIXMLASSERT( _size >= count );
        _size -= count;
    }
@@ -251,13 +250,13 @@ public:
        return _size == 0;
    }

-    T& operator[](int i)				{
-        TIXMLASSERT( i>= 0 && i < _size );
+    T& operator[](size_t i) {
+        TIXMLASSERT( i < _size );
        return _mem[i];
    }

-    const T& operator[](int i) const	{
-        TIXMLASSERT( i>= 0 && i < _size );
+    const T& operator[](size_t i) const {
+        TIXMLASSERT( i < _size );
        return _mem[i];
    }

@@ -266,18 +265,17 @@ public:
        return _mem[ _size - 1];
    }

-    int Size() const					{
-        TIXMLASSERT( _size >= 0 );
+    size_t Size() const {
        return _size;
    }

-    int Capacity() const				{
+    size_t Capacity() const {
        TIXMLASSERT( _allocated >= INITIAL_SIZE );
        return _allocated;
    }

-	void SwapRemove(int i) {
-		TIXMLASSERT(i >= 0 && i < _size);
+	void SwapRemove(size_t i) {
+		TIXMLASSERT(i < _size);
 		TIXMLASSERT(_size > 0);
 		_mem[i] = _mem[_size - 1];
 		--_size;
@@ -297,14 +295,14 @@ private:
    DynArray( const DynArray& ); // not supported
    void operator=( const DynArray& ); // not supported

-    void EnsureCapacity( int cap ) {
+    void EnsureCapacity( size_t cap ) {
        TIXMLASSERT( cap > 0 );
        if ( cap > _allocated ) {
-            TIXMLASSERT( cap <= INT_MAX / 2 );
-            const int newAllocated = cap * 2;
-            T* newMem = new T[static_cast<unsigned int>(newAllocated)];
+            TIXMLASSERT( cap <= SIZE_MAX / 2 / sizeof(T));
+            const size_t newAllocated = cap * 2;
+            T* newMem = new T[newAllocated];
            TIXMLASSERT( newAllocated >= _size );
-            memcpy( newMem, _mem, sizeof(T)*static_cast<size_t>(_size) );	// warning: not using constructors, only works for PODs
+            memcpy( newMem, _mem, sizeof(T) * _size );	// warning: not using constructors, only works for PODs
            if ( _mem != _pool ) {
                delete [] _mem;
            }
@@ -314,9 +312,9 @@ private:
    }

    T*  _mem;
-    T   _pool[static_cast<size_t>(INITIAL_SIZE)];
-    int _allocated;		// objects allocated
-    int _size;			// number objects in use
+    T   _pool[INITIAL_SIZE];
+    size_t _allocated;		// objects allocated
+    size_t _size;			// number objects in use
 };


@@ -330,7 +328,7 @@ public:
    MemPool() {}
    virtual ~MemPool() {}

-    virtual int ItemSize() const = 0;
+    virtual size_t ItemSize() const = 0;
    virtual void* Alloc() = 0;
    virtual void Free( void* ) = 0;
    virtual void SetTracked() = 0;
@@ -340,7 +338,7 @@ public:
 /*
 	Template child class to create pools of the correct type.
 */
-template< int ITEM_SIZE >
+template< size_t ITEM_SIZE >
 class MemPoolT : public MemPool
 {
 public:
@@ -362,10 +360,10 @@ public:
        _nUntracked = 0;
    }

-    virtual int ItemSize() const override{
+    virtual size_t ItemSize() const override {
        return ITEM_SIZE;
    }
-    int CurrentAllocs() const		{
+    size_t CurrentAllocs() const {
        return _currentAllocs;
    }

@@ -376,7 +374,7 @@ public:
            _blockPtrs.Push( block );

            Item* blockItems = block->items;
-            for( int i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) {
+            for( size_t i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) {
                blockItems[i].next = &(blockItems[i + 1]);
            }
            blockItems[ITEMS_PER_BLOCK - 1].next = 0;
@@ -417,7 +415,7 @@ public:
        --_nUntracked;
    }

-    int Untracked() const {
+    size_t Untracked() const {
        return _nUntracked;
    }

@@ -448,10 +446,10 @@ private:
    DynArray< Block*, 10 > _blockPtrs;
    Item* _root;

-    int _currentAllocs;
-    int _nAllocs;
-    int _maxAllocs;
-    int _nUntracked;
+    size_t _currentAllocs;
+    size_t _nAllocs;
+    size_t _maxAllocs;
+    size_t _nUntracked;
 };


@@ -892,7 +890,7 @@ public:

 		If the 'target' is null, then the nodes will
 		be allocated in the current document. If 'target'
-        is specified, the memory will be allocated is the
+        is specified, the memory will be allocated in the
        specified XMLDocument.

 		NOTE: This is probably not the correct tool to
@@ -1981,11 +1979,11 @@ private:
 	void PushDepth();
 	void PopDepth();

-    template<class NodeType, int PoolElementSize>
+    template<class NodeType, size_t PoolElementSize>
    NodeType* CreateUnlinkedNode( MemPoolT<PoolElementSize>& pool );
 };

-template<class NodeType, int PoolElementSize>
+template<class NodeType, size_t PoolElementSize>
 inline NodeType* XMLDocument::CreateUnlinkedNode( MemPoolT<PoolElementSize>& pool )
 {
    TIXMLASSERT( sizeof( NodeType ) == PoolElementSize );
@@ -2241,13 +2239,18 @@ private:
 class TINYXML2_LIB XMLPrinter : public XMLVisitor
 {
 public:
+    enum EscapeAposCharsInAttributes {
+        ESCAPE_APOS_CHARS_IN_ATTRIBUTES,
+        DONT_ESCAPE_APOS_CHARS_IN_ATTRIBUTES
+    };
+
    /** Construct the printer. If the FILE* is specified,
    	this will print to the FILE. Else it will print
    	to memory, and the result is available in CStr().
    	If 'compact' is set to true, then output is created
    	with only required whitespace and newlines.
    */
-    XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 );
+    XMLPrinter( FILE* file=0, bool compact = false, int depth = 0, EscapeAposCharsInAttributes aposInAttributes = ESCAPE_APOS_CHARS_IN_ATTRIBUTES );
    virtual ~XMLPrinter()	{}

    /** If streaming, write the BOM and declaration. */
@@ -2315,7 +2318,7 @@ public:
    	of the XML file in memory. (Note the size returned
    	includes the terminating null.)
    */
-    int CStrSize() const {
+    size_t CStrSize() const {
        return _buffer.Size();
    }
    /**
@@ -2375,7 +2378,7 @@ private:
 };


-}	// tinyxml2
+} // namespace tinyxml2

 #if defined(_MSC_VER)
 #   pragma warning(pop)
@@ -324,9 +324,9 @@ int main( int argc, const char ** argv )

 		printf( "Test file '%s' loaded. ErrorID=%d\n", argv[1], errorID );
 		if ( !errorID ) {
-			printf( "Load time=%u\n",   (unsigned)(loadTime - startTime) );
-			printf( "Delete time=%u\n", (unsigned)(deleteTime - loadTime) );
-			printf( "Total time=%u\n",  (unsigned)(deleteTime - startTime) );
+			printf( "Load time=%u\n",   static_cast<unsigned>(loadTime - startTime) );
+			printf( "Delete time=%u\n", static_cast<unsigned>(deleteTime - loadTime) );
+			printf( "Total time=%u\n",  static_cast<unsigned>(deleteTime - startTime) );
 		}
 		exit(0);
 	}
@@ -595,8 +595,8 @@ int main( int argc, const char ** argv )

 		result = ele->QueryDoubleAttribute( "attr0", &dVal );
 		XMLTest( "Query attribute: int as double", XML_SUCCESS, result);
-		XMLTest( "Query attribute: int as double", 1, (int)dVal );
-		XMLTest( "Query attribute: int as double", 1, (int)ele->DoubleAttribute("attr0"));
+		XMLTest( "Query attribute: int as double", 1, static_cast<int>(dVal) );
+		XMLTest( "Query attribute: int as double", 1, static_cast<int>(ele->DoubleAttribute("attr0")));

 		result = ele->QueryDoubleAttribute( "attr1", &dVal );
 		XMLTest( "Query attribute: double as double", XML_SUCCESS, result);
@@ -648,17 +648,17 @@ int main( int argc, const char ** argv )

 		{
 			XMLError queryResult = ele->QueryAttribute( "int", &iVal2 );
-			XMLTest( "Query int attribute generic", (int)XML_SUCCESS, queryResult);
+			XMLTest( "Query int attribute generic", static_cast<int>(XML_SUCCESS), queryResult);
 		}
 		{
 			XMLError queryResult = ele->QueryAttribute( "double", &dVal2 );
-			XMLTest( "Query double attribute generic", (int)XML_SUCCESS, queryResult);
+			XMLTest( "Query double attribute generic", static_cast<int>(XML_SUCCESS), queryResult);
 		}

 		XMLTest( "Attribute match test", "strValue", ele->Attribute( "str", "strValue" ) );
 		XMLTest( "Attribute round trip. c-string.", "strValue", cStr );
 		XMLTest( "Attribute round trip. int.", 1, iVal );
-		XMLTest( "Attribute round trip. double.", -1, (int)dVal );
+		XMLTest( "Attribute round trip. double.", -1, static_cast<int>(dVal) );
 		XMLTest( "Alternate query", true, iVal == iVal2 );
 		XMLTest( "Alternate query", true, dVal == dVal2 );
 		XMLTest( "Alternate query", true, iVal == ele->IntAttribute("int") );
@@ -675,7 +675,7 @@ int main( int argc, const char ** argv )
 		const unsigned char correctValue[] = {	0xd1U, 0x86U, 0xd0U, 0xb5U, 0xd0U, 0xbdU, 0xd0U, 0xbdU,
 												0xd0U, 0xbeU, 0xd1U, 0x81U, 0xd1U, 0x82U, 0xd1U, 0x8cU, 0 };

-		XMLTest( "UTF-8: Russian value.", (const char*)correctValue, element->Attribute( "value" ) );
+		XMLTest( "UTF-8: Russian value.", reinterpret_cast<const char*>(correctValue), element->Attribute( "value" ) );

 		const unsigned char russianElementName[] = {	0xd0U, 0xa0U, 0xd1U, 0x83U,
 														0xd1U, 0x81U, 0xd1U, 0x81U,
@@ -683,7 +683,7 @@ int main( int argc, const char ** argv )
 														0xd0U, 0xb9U, 0 };
 		const char russianText[] = "<\xD0\xB8\xD0\xBC\xD0\xB5\xD0\xB5\xD1\x82>";

-		XMLText* text = doc.FirstChildElement( "document" )->FirstChildElement( (const char*) russianElementName )->FirstChild()->ToText();
+		XMLText* text = doc.FirstChildElement( "document" )->FirstChildElement( reinterpret_cast<const char*>(russianElementName) )->FirstChild()->ToText();
 		XMLTest( "UTF-8: Browsing russian element name.",
 				 russianText,
 				 text->Value() );
@@ -824,7 +824,7 @@ int main( int argc, const char ** argv )
 			{
 				int v = 0;
 				XMLError queryResult = element->QueryAttribute("attrib", &v);
-				XMLTest("Attribute: int", (int)XML_SUCCESS, queryResult, true);
+				XMLTest("Attribute: int", static_cast<int>(XML_SUCCESS), queryResult, true);
 				XMLTest("Attribute: int", -100, v, true);
 			}
 			XMLTest("Attribute: int", -100, element->IntAttribute("attrib"), true);
@@ -840,7 +840,7 @@ int main( int argc, const char ** argv )
 			{
 				unsigned v = 0;
 				XMLError queryResult = element->QueryAttribute("attrib", &v);
-				XMLTest("Attribute: unsigned", (int)XML_SUCCESS, queryResult, true);
+				XMLTest("Attribute: unsigned", static_cast<int>(XML_SUCCESS), queryResult, true);
 				XMLTest("Attribute: unsigned", unsigned(100), v, true);
 			}
 			{
@@ -864,7 +864,7 @@ int main( int argc, const char ** argv )
 			{
 				int64_t v = 0;
 				XMLError queryResult = element->QueryAttribute("attrib", &v);
-				XMLTest("Attribute: int64_t", (int)XML_SUCCESS, queryResult, true);
+				XMLTest("Attribute: int64_t", static_cast<int>(XML_SUCCESS), queryResult, true);
 				XMLTest("Attribute: int64_t", BIG, v, true);
 			}
 			XMLTest("Attribute: int64_t", BIG, element->Int64Attribute("attrib"), true);
@@ -880,7 +880,7 @@ int main( int argc, const char ** argv )
            {
                uint64_t v = 0;
 				XMLError queryResult = element->QueryAttribute("attrib", &v);
-                XMLTest("Attribute: uint64_t", (int)XML_SUCCESS, queryResult, true);
+                XMLTest("Attribute: uint64_t", static_cast<int>(XML_SUCCESS), queryResult, true);
                XMLTest("Attribute: uint64_t", BIG_POS, v, true);
            }
            XMLTest("Attribute: uint64_t", BIG_POS, element->Unsigned64Attribute("attrib"), true);
@@ -896,7 +896,7 @@ int main( int argc, const char ** argv )
 			{
 				bool v = false;
 				XMLError queryResult = element->QueryAttribute("attrib", &v);
-				XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true);
+				XMLTest("Attribute: bool", static_cast<int>(XML_SUCCESS), queryResult, true);
 				XMLTest("Attribute: bool", true, v, true);
 			}
 			XMLTest("Attribute: bool", true, element->BoolAttribute("attrib"), true);
@@ -924,7 +924,7 @@ int main( int argc, const char ** argv )
 			{
 				double v = 0;
 				XMLError queryResult = element->QueryAttribute("attrib", &v);
-				XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true);
+				XMLTest("Attribute: bool", static_cast<int>(XML_SUCCESS), queryResult, true);
 				XMLTest("Attribute: double", 100.0, v, true);
 			}
 			XMLTest("Attribute: double", 100.0, element->DoubleAttribute("attrib"), true);
@@ -940,7 +940,7 @@ int main( int argc, const char ** argv )
 			{
 				float v = 0;
 				XMLError queryResult = element->QueryAttribute("attrib", &v);
-				XMLTest("Attribute: float", (int)XML_SUCCESS, queryResult, true);
+				XMLTest("Attribute: float", static_cast<int>(XML_SUCCESS), queryResult, true);
 				XMLTest("Attribute: float", 100.0f, v, true);
 			}
 			XMLTest("Attribute: float", 100.0f, element->FloatAttribute("attrib"), true);
@@ -1005,7 +1005,7 @@ int main( int argc, const char ** argv )
 			FILE* fp1 = fopen("resources/out/printer_1.xml", "w");
 			XMLPrinter printer(fp1);

-			printer.PushDeclaration("version = '1.0' enconding = 'utf-8'");
+			printer.PushDeclaration("version = '1.0' encoding = 'utf-8'");

 			printer.OpenElement("foo");
 			printer.PushAttribute("attrib-text", "text");
@@ -1068,15 +1068,15 @@ int main( int argc, const char ** argv )

 			unsigned  unsigned_value;
 			unsigned_value = root->FirstChildElement("unsigned")->UnsignedText();
-			XMLTest("PushText( unsigned value ) test", (unsigned)12, unsigned_value);
+			XMLTest("PushText( unsigned value ) test", static_cast<unsigned>(12), unsigned_value);

 			int64_t  int64_t_value;
 			int64_t_value = root->FirstChildElement("int64_t")->Int64Text();
-			XMLTest("PushText( int64_t value ) test", (int64_t) 13, int64_t_value);
+			XMLTest("PushText( int64_t value ) test", static_cast<int64_t>(13), int64_t_value);

 			uint64_t uint64_t_value;
 			uint64_t_value = root->FirstChildElement("uint64_t")->Unsigned64Text();
-			XMLTest("PushText( uint64_t value ) test", (uint64_t) 14, uint64_t_value);
+			XMLTest("PushText( uint64_t value ) test", static_cast<uint64_t>(14), uint64_t_value);

 			float  float_value;
 			float_value = root->FirstChildElement("float")->FloatText();
@@ -1096,7 +1096,7 @@ int main( int argc, const char ** argv )

 			const XMLDeclaration* declaration = cdoc.FirstChild()->ToDeclaration();
 			const char* declaration_value = declaration->Value();
-			XMLTest("PushDeclaration() test", "version = '1.0' enconding = 'utf-8'", declaration_value);
+			XMLTest("PushDeclaration() test", "version = '1.0' encoding = 'utf-8'", declaration_value);
 		}
 	}

@@ -1397,7 +1397,7 @@ int main( int argc, const char ** argv )
 		buf[61] = 0;

 		XMLDocument doc;
-		doc.Parse( (const char*)buf);
+		doc.Parse( reinterpret_cast<const char*>(buf) );
 		XMLTest( "Broken CDATA", true, doc.Error() );
 	}

@@ -1642,7 +1642,7 @@ int main( int argc, const char ** argv )

 		static const char* result  = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
 		XMLTest( "BOM and default declaration", result, printer.CStr(), false );
-		XMLTest( "CStrSize", 42, printer.CStrSize(), false );
+		XMLTest( "CStrSize", true, printer.CStrSize() == 42, false );
 	}
 	{
 		const char* xml = "<ipxml ws='1'><info bla=' /></ipxml>";
@@ -1753,7 +1753,7 @@ int main( int argc, const char ** argv )
 			unsigned unsignedValue = 0;
 			XMLError queryResult = pointElement->FirstChildElement( "y" )->QueryUnsignedText( &unsignedValue );
 			XMLTest( "QueryUnsignedText result", XML_SUCCESS, queryResult, false );
-			XMLTest( "QueryUnsignedText", (unsigned)1, unsignedValue, false );
+			XMLTest( "QueryUnsignedText", static_cast<unsigned>(1), unsignedValue, false );
 		}

 		{
@@ -2639,7 +2639,7 @@ int main( int argc, const char ** argv )
            "<?xml version=\"1.0\"?>\n"					// 2 DecL
            "<root>\r\n"								// 3 Element
            "\n"										// 4
-            "text contining new line \n"				// 5 Text
+            "text containing new line \n"				// 5 Text
            " and also containing crlf \r\n"			// 6
            "<sub><![CDATA[\n"							// 7 Element Text
            "cdata containing new line \n"				// 8
@@ -2666,6 +2666,70 @@ int main( int argc, const char ** argv )
    	doc.PrintError();
    }

+	// ---------- CVE-2024-50615 -----------
+	{
+		const char* xml = "<Hello value='12&#65;34' value2='56&#x42;78'>Text</Hello>";
+		XMLDocument doc;
+		doc.Parse(xml);
+		const char* value = doc.FirstChildElement()->Attribute("value");
+		const char* value2 = doc.FirstChildElement()->Attribute("value2");
+		XMLTest("Test attribute encode", false, doc.Error());
+		XMLTest("Test decimal value", value, "12A34");
+		XMLTest("Test hex encode", value2, "56B78");
+	}
+
+	{
+		const char* xml = "<Hello value='&#ABC9000000065;' value2='&#xffffffff;' value3='&#5000000000;' value4='&#x00000045;' value5='&#x000000000000000021;'>Text</Hello>";
+		XMLDocument doc;
+		doc.Parse(xml);
+		const char* value = doc.FirstChildElement()->Attribute("value");
+		const char* value2 = doc.FirstChildElement()->Attribute("value2");
+		const char* value3 = doc.FirstChildElement()->Attribute("value3");
+		const char* value4 = doc.FirstChildElement()->Attribute("value4");
+		const char* value5 = doc.FirstChildElement()->Attribute("value5");
+		XMLTest("Test attribute encode", false, doc.Error());
+		XMLTest("Test attribute encode too long value", value, "&#ABC9000000065;"); // test long value
+		XMLTest("Test attribute encode out of unicode range", value2, "&#xffffffff;"); // out of unicode range
+		XMLTest("Test attribute encode out of int max value", value3, "&#5000000000;"); // out of int max value
+		XMLTest("Test attribute encode with a Hex value", value4, "E"); // hex value in unicode value
+		XMLTest("Test attribute encode with a Hex value", value5, "!"); // hex value in unicode value
+	}
+
+	// ---------- XMLPrinter Apos Escaping ------
+	{
+		const char* testText = "text containing a ' character";
+		XMLDocument doc;
+		XMLElement* element = doc.NewElement( "element" );
+		doc.InsertEndChild( element );
+		element->SetAttribute( "attrib", testText );
+		{
+			XMLPrinter defaultPrinter;
+			doc.Print( &defaultPrinter );
+			const char* defaultOutput = defaultPrinter.CStr();
+			const bool foundTextWithUnescapedApos = (strstr(defaultOutput, testText) != nullptr); 
+			XMLTest("Default XMLPrinter should escape ' characters", false, foundTextWithUnescapedApos);
+			{
+				XMLDocument parsingDoc;
+				parsingDoc.Parse(defaultOutput);
+				const XMLAttribute* attrib = parsingDoc.FirstChildElement("element")->FindAttribute("attrib");
+				XMLTest("Default XMLPrinter should output parsable xml", testText, attrib->Value(), true);
+			}
+		}
+		{
+			XMLPrinter customPrinter(0, false, 0, XMLPrinter::DONT_ESCAPE_APOS_CHARS_IN_ATTRIBUTES);
+			doc.Print( &customPrinter );
+			const char* customOutput = customPrinter.CStr();
+			const bool foundTextWithUnescapedApos = (strstr(customOutput, testText) != nullptr); 
+			XMLTest("Custom XMLPrinter should not escape ' characters", true, foundTextWithUnescapedApos);
+			{
+				XMLDocument parsingDoc;
+				parsingDoc.Parse(customOutput);
+				const XMLAttribute* attrib = parsingDoc.FirstChildElement("element")->FindAttribute("attrib");
+				XMLTest("Custom XMLPrinter should output parsable xml", testText, attrib->Value(), true);
+			}
+		}
+	}
+	
    // ----------- Performance tracking --------------
 	{
 #if defined( _MSC_VER )
@@ -2715,9 +2779,9 @@ int main( int argc, const char ** argv )
 #endif

 #if defined( _MSC_VER )
-		const double duration = 1000.0 * (double)(end - start) / ((double)freq * (double)COUNT);
+		const double duration = 1000.0 * static_cast<double>(end - start) / (static_cast<double>(freq) * static_cast<double>(COUNT));
 #else
-		const double duration = (double)(cend - cstart) / (double)COUNT;
+		const double duration = static_cast<double>(cend - cstart) / static_cast<double>(COUNT);
 #endif
 		printf("\nParsing dream.xml (%s): %.3f milli-seconds\n", note, duration);
 	}
Author	SHA1	Message	Date
Lee Thomason	118358092a	remove the c code path	2025-11-22 15:59:12 -08:00
Lee Thomason	888bbb912a	Merge branch 'MattHuangGarmin-master' into leethomason/fallthrough	2025-11-22 15:47:41 -08:00
Lee Thomason	9c09e46619	move to cpp file	2025-11-22 15:46:45 -08:00
Lee Thomason	6d6285b18a	Merge branch 'master' of github.com:MattHuangGarmin/tinyxml2 into MattHuangGarmin-master	2025-11-22 15:44:05 -08:00
Lee Thomason	2722500313	Merge pull request #1043 from gruenich/feature/replace-c-style-casts Replace C-style casts	2025-11-22 15:38:08 -08:00
MattHuangGarmin	be7b5a107f	Fix GCC 4.9.3 Build Errors Since GCC version 4.9.3 does not support the -Wimplicit-fallthrough warning option or the __attribute__((fallthrough)) annotation, introduce the corresponding fixes to prevent build errors.	2025-11-04 14:40:21 +08:00
Christoph Grüninger	b5e767a6b9	Fix more warnings for C-style casts Use static_cast or reinterpret_cast. Found by g++ 15.	2025-07-26 23:08:21 +02:00
Lurend	e186491558	fix compilation warnings produced by -Wold-style-cast	2025-07-26 14:26:04 +02:00
Lee Thomason	36ff404c34	Update yaml file Update yaml file	2025-07-09 20:54:23 -07:00
Lee Thomason	302f4661a7	update yaml	2025-07-09 20:48:05 -07:00
Lee Thomason	e6caeae857	Fix the build actions by increasing the ubuntu test version Update ubuntu build version	2025-06-08 11:37:20 -07:00
Lee Thomason	b765a210b3	grumble	2025-06-08 11:29:52 -07:00
Lee Thomason	6e246aec4d	update ubuntu build version	2025-06-08 11:28:28 -07:00
Lee Thomason	30dee1efa0	Merge pull request #1021 from Malcohol/Malcohol/optionalAposHandling Optional Apos escaping	2025-06-08 11:17:12 -07:00
Lee Thomason	a93163d2f5	Merge pull request #1020 from lbatuska/master Remove unnecessary assert >=0 on size_t	2025-06-08 11:08:25 -07:00
Malcolm Tyrrell	f87d0e3077	Add test for new and default behaviour	2025-03-30 10:20:26 +01:00
Malcolm Tyrrell	487f42aa69	Optional apos escaping	2025-03-29 18:13:43 +00:00
Levente Batuska	afff7bf328	fix: remove unnecessary assert	2025-03-20 02:06:08 +01:00
Lee Thomason	9148bdf719	setting the version to 11.0.0	2025-03-15 14:45:48 -07:00
Lee Thomason	57eea48c5b	version to 10.1.0	2025-03-08 10:45:16 -08:00
Lee Thomason	198cb82c9b	Merge pull request #1017 from luzpaz/typos-xmltest fix typos in xmltest.cpp	2025-03-08 10:36:50 -08:00
Lee Thomason	c6ab6d76e8	Merge pull request #1013 from AlbertHungGarmin/arm_compiler_error Fix ARM Compiler build errors	2025-03-08 10:36:09 -08:00
luzpaz	008e32968f	fix typos in xmltest.cpp Found via `codespell -q 3 -S "./resources/dream.xml" -L currenty,ot,previousy,te,ue`	2025-01-25 09:51:29 -05:00
Albert Hung	0ca3584fa4	Fix ARM Compiler build errors Fix build errors on ARM Compiler 5 (DS-5) by treating the compiler like QNX, Borland C, and the Android NDK for purposes of system header includes.	2024-12-17 10:13:57 +08:00
Lee Thomason	57ec94127b	Merge pull request #1011 from leethomason/leethomason/charref2 Defensive check for UTF conversion	2024-12-09 21:47:05 -08:00
Lee Thomason	1fadaae0c9	another defensive check	2024-12-09 21:39:30 -08:00
Lee Thomason	4cbb25155c	Merge pull request #1009 from leethomason/leethomason/charref Fix the potential overflow in char refs	2024-12-09 21:21:42 -08:00
Lee Thomason	ff48ea1bae	improve fix	2024-12-09 21:17:33 -08:00
Lee Thomason	494735de30	fix the potential overflow in char refs	2024-12-04 18:07:15 -08:00
Lee Thomason	d418ac22f2	Merge pull request #1007 from gruenich/feature/update-github-actions update GitHub actions checkout and actions-setup-cmake	2024-12-04 17:49:04 -08:00
Lee Thomason	d13a151c8d	Merge pull request #1004 from bebuch/master add CMake option to disable PkgConfig install	2024-12-04 17:46:06 -08:00
Lee Thomason	601a953b74	Merge pull request #1008 from AlbertHungGarmin/old-style-cast_warning Fixed old-style-cast warnings	2024-12-04 17:44:31 -08:00
Albert Hung	162bd4e925	Fixed -Wold-style-cast warnings Fixed old-style-cast warnings	2024-12-02 13:47:07 +08:00
Christoph Grüninger	1fdf653269	GitHub Actions: Update actions/checkout to v4 Fixes warnings regarding deprecated node12	2024-11-24 17:24:03 +01:00
Christoph Grüninger	86fe31c836	GitHub Actions: Update actions-setup-cmake to v2 Fixes warnings regarding deprecated node12	2024-11-24 17:21:49 +01:00
Benjamin Buch	20ecbb22d8	add CMake option to disable PkgConfig install	2024-11-20 16:22:20 +01:00
Lee Thomason	374292e9ba	Merge pull request #998 from Sigmarik/master Fix: typo in the `XMLNode::DeepClone` description	2024-09-02 09:33:10 -07:00
Lee Thomason	2ac336a253	Merge pull request #992 from ssmolov/namespace.comment.fix fix tinyxml2 namespaces' ending comment	2024-09-02 09:32:55 -07:00
Lee Thomason	38894bfa7f	Merge pull request #993 from jengelh/master Make DocPrinter support DynArrays larger than 2G	2024-09-02 09:29:54 -07:00
sigmarik	780b16b5ae	chore: fix typo in the `XMLNode::DeepClone` description	2024-08-31 19:34:27 +03:00
Jan Engelhardt	04bbc06cd0	Make DocPrinter support DynArrays larger than 2G If the DynArray within an XMLPrinter object carries 2 gigabytes of data or more, XMLPrinter::CStrSize returns a truncated result. If a program casts this back to size_t without thought, sign extension leads to bad things(tm). ```c++ int main() { tinyxml2::XMLDocument doc; doc.InsertEndChild(doc.NewDeclaration()); auto root = doc.NewElement("root"); size_t sz = 0x80000002; auto blank = new char[sz]; memset(blank, ' ', sz); blank[sz-1]='\0'; root->SetText(blank); doc.InsertEndChild(root); tinyxml2::XMLPrinter printer(nullptr); doc.Print(&printer); std::string_view sv{printer.CStr(), static_cast<size_t>(printer.CStrSize())}; // sv.size() is way too big, causing overflows on access std::string dup(sv); // boom } ``` Fixes: 2.0.2-873-geb3ab0d	2024-08-14 15:28:42 +02:00
Sergey Smolov	62f6b14e91	fixup Signed-off-by: Sergey Smolov <smolov@ispras.ru>	2024-08-12 19:22:22 +03:00
Sergey Smolov	b25c39aaad	fix tinyxml2 namespaces' ending comment Signed-off-by: Sergey Smolov <smolov@ispras.ru>	2024-08-12 19:16:14 +03:00
Lee Thomason	8a519a556a	Merge pull request #990 from jengelh/master Avoid crashing when SetText is called with a 2GB large string	2024-07-06 12:41:55 -07:00
Lee Thomason	c93b6f78d4	Revert "Merge pull request #983 from DiplomInformatikerFranzHoepfinger/feature/fix_32_bit_types" This reverts commit `8e4bfebad5`, reversing changes made to `a0f66fdf71`.	2024-07-06 12:28:04 -07:00
Lee Thomason	8e4bfebad5	Merge pull request #983 from DiplomInformatikerFranzHoepfinger/feature/fix_32_bit_types Update QueryIntValue and QueryUnsignedValue to use int32_t and uint32_t types for better consistency.	2024-07-06 12:00:24 -07:00
Jan Engelhardt	eb3ab0df5d	Make DynArray support objects larger than 1 gigabyte The expression ``const int newAllocated = cap * 2;`` easily causes overflow, as soon as the input is 1.0 GiB. This goes unnoticed because release builds of tinyxml2 do not have active assertions. The change in commit 9.0.0-20-g8fd6cc6 did not do anything useful; the signed multiplication overflow (and thus undefined behavior) still occurs. Using ``int`` in this class is really archaic, because it limits the class to a gigabyte even on 64-bit platforms. The multiplication overflow check also needs to include sizeof(T), otherwise you can run into unsigned multiplication overflow (defined, but undesirable) in the memcpy() call. testcase: int main() { tinyxml2::XMLDocument doc; doc.InsertEndChild(doc.NewDeclaration()); auto root = doc.NewElement("root"); size_t sz = 0x80000001; auto blank = new char[sz]; memset(blank, ' ', sz); blank[sz-1]='\0'; root->SetText(blank); doc.InsertEndChild(root); tinyxml2::XMLPrinter printer(nullptr); doc.Print(&printer); }	2024-07-01 22:07:51 +02:00
Jan Engelhardt	3a893e5757	Remove extraneous +x bit from source files	2024-07-01 14:14:33 +02:00
Lee Thomason	a0f66fdf71	Merge pull request #984 from Blake-Madden/master Fix typo in comment	2024-06-13 08:29:51 -07:00
Lee Thomason	a965e28c4f	Merge pull request #978 from AlbertHungGarmin/fix-format-specifier Fix format specifier mismatch in XMLUtil::ToStr	2024-06-13 08:17:16 -07:00
Blake-Madden	5b04868fee	Fix typo in comment	2024-06-01 15:41:57 -04:00
Franz Höpfinger	8df9b25bb9	Update attribute handling to use int32_t and uint32_t types. The commit changes the attribute handling in the code to utilize int32_t and uint32_t types for better consistency and compatibility.	2024-05-30 20:31:00 +02:00
Franz Höpfinger	53d8ec5573	Update attribute setting functions to use specific integer types The commit updates attribute setting functions to use int32_t and uint32_t types for better clarity and consistency.	2024-05-30 20:28:46 +02:00
Franz Höpfinger	5e27269c04	Update attribute setting functions to use specific integer types The commit changes the attribute setting functions in both the .cpp and .h files to use int32_t and uint32_t instead of int and unsigned for better type specificity.	2024-05-30 20:27:26 +02:00
Franz Höpfinger	693052afe4	Update integer types to int32_t and uint32_t for better clarity and consistency.	2024-05-30 20:19:13 +02:00
Franz Höpfinger	42875a9f60	Update data type in ToBool function for better clarity and consistency. - Change int to int32_t in the ToBool function for improved data type clarity.	2024-05-30 20:16:20 +02:00
Franz Höpfinger	afb8fabf58	Update integer parsing to use long type and unsigned parsing to use unsigned long type for better compatibility with different platforms. Update integer parsing to use long type and unsigned parsing to use unsigned long type for better compatibility with different platforms. Alternatively, use the PRI Macros there. alternatively use the PRI Macros there.	2024-05-30 20:13:48 +02:00
Franz Höpfinger	a151353f3a	Update integer to string conversion functions for different data types. - Changed formatting from %d to %ld for int32_t. - Changed formatting from %u to %lu for uint32_t. alternatively use the PRI Macros there.	2024-05-30 20:08:50 +02:00
Franz Höpfinger	ef185a8f85	Update PushText functions to use specific integer types The commit changes the PushText functions in both the .cpp and .h files to utilize int32_t and uint32_t instead of int and unsigned for better type specificity.	2024-05-30 20:05:52 +02:00
Franz Höpfinger	8fed517e5d	Update SetText method parameters to use int32_t and uint32_t. This change updates the SetText method in both the .cpp and .h files to use int32_t and uint32_t types for better consistency and clarity.	2024-05-30 19:53:50 +02:00
Franz Höpfinger	e269b2e91f	Update QueryIntText and QueryUnsignedText functions to use int32_t and uint32_t types instead of int and unsigned in tinyxml2.cpp and tinyxml2.h.	2024-05-30 19:53:44 +02:00
Franz Höpfinger	cd8c1a6322	Update ToStr functions to use int32_t and uint32_t types, and change corresponding function signatures in the header file. Update ToInt and ToUnsigned functions to use int32_t and uint32_t types respectively.	2024-05-30 19:34:59 +02:00
Franz Höpfinger	668fd81256	Update attribute types to int32_t and uint32_t for better consistency and clarity. Update attribute types to int32_t and uint32_t for better consistency and clarity. Changed attribute types to int32_t and uint32_t for IntAttribute and UnsignedAttribute methods in both .cpp and .h files.	2024-05-30 19:31:58 +02:00
Franz Höpfinger	095a8ffa42	Update IntValue and UnsignedValue to use int32_t and uint32_t types. This change ensures consistent integer handling throughout the codebase.	2024-05-30 19:24:09 +02:00
Franz Höpfinger	574c760b7f	Update attribute query functions to use int32_t and uint32_t types. - Changed QueryAttribute parameter type from int* to int32_t* - Changed QueryAttribute parameter type from unsigned int* to uint32_t*	2024-05-30 19:22:25 +02:00
Franz Höpfinger	5d219c893b	Update attribute query functions to use int32_t and uint32_t types. - Changed QueryIntAttribute parameter type from int* to int32_t* - Changed QueryUnsignedAttribute parameter type from unsigned int* to uint32_t*	2024-05-30 19:21:27 +02:00
Franz Höpfinger	fd26a5ee1f	Update QueryIntValue and QueryUnsignedValue to use int32_t and uint32_t types for better consistency.	2024-05-30 19:15:52 +02:00
Albert Hung	dded8bb2e9	Fix format specifier mismatch in XMLUtil::ToStr In the XMLUtil::ToStr( uint64_t v, char* buffer, int bufferSize ) function, the format specifier %llu was used with a signed long long argument. This caused a type mismatch warning. The argument has been changed to unsigned long long to match the format specifier, resolving the warning.	2024-05-15 19:43:55 +08:00
Lee Thomason	312a809224	Merge pull request #976 from leethomason/AlbertHungGarmin-format_error Albert hung garmin format error	2024-04-20 19:46:41 -07:00
Lee Thomason	0f9c021a44	Merge pull request #973 from davidoakley/fix-android-before-api24 Use fseek/ftell on Android when api level < 24	2024-04-20 19:34:58 -07:00
David Oakley	dfc20c5f8f	Android SDK<24 doesn’t support fseeko/ftello Fall back to using fseek/ftell; This was broken by https://github.com/leethomason/tinyxml2/pull/903/commits/d9fb8d34439be452c18b63713e2e0ae0e6028072	2024-04-08 12:58:12 +01:00