diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2023-03-19 14:57:10 -0700 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2023-03-19 14:57:10 -0700 |
| commit | a469fa2cfc9f0202fa7631a80f67bffbda01fa2e (patch) | |
| tree | 3cf66b907795a31876112b85434e170a33a8a0c9 /src | |
| parent | 544b0a49eb22463ca1e3f28f94e0aca6a84838a3 (diff) | |
| download | pugixml-a469fa2cfc9f0202fa7631a80f67bffbda01fa2e.zip pugixml-a469fa2cfc9f0202fa7631a80f67bffbda01fa2e.tar.gz pugixml-a469fa2cfc9f0202fa7631a80f67bffbda01fa2e.tar.bz2 | |
Add assertion about header-dest relation to strcpy_insitu
May improve static analysis behavior for #555.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pugixml.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index beec50c..2f15073 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -2374,6 +2374,8 @@ PUGI_IMPL_NS_BEGIN template <typename String, typename Header> PUGI_IMPL_FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length) { + assert((header & header_mask) == 0 || dest); // header bit indicates whether dest was previously allocated + if (source_length == 0) { // empty string and null pointer are equivalent, so just deallocate old memory @@ -4408,7 +4410,7 @@ PUGI_IMPL_NS_BEGIN template <typename String, typename Header> PUGI_IMPL_FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc) { - assert(!dest && (header & header_mask) == 0); + assert(!dest && (header & header_mask) == 0); // copies are performed into fresh nodes if (source) { |