mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

xmlparse.cpp skip memmove if pool->start (src) is 0

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-01-03 15:14:53 +01:00
parent 1d76394de6
commit 445bb5e600
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/xmltree/xmlparse.cpp
View File

@@ -854,7 +854,7 @@ enum XML_Error XML_Parser::doContent(int startTagLevel, const ENCODING *enc, con
if (result) return result; if (result) return result;
}; };
// fall through */ // fall through
case XML_TOK_EMPTY_ELEMENT_NO_ATTS: case XML_TOK_EMPTY_ELEMENT_NO_ATTS:
if (startElementHandler || endElementHandler) if (startElementHandler || endElementHandler)
@@ -2691,6 +2691,7 @@ static int poolGrow(STRING_POOL *pool)
pool->blocks=pool->freeBlocks; pool->blocks=pool->freeBlocks;
pool->freeBlocks=tem; pool->freeBlocks=tem;
if (pool->start)
memmove(pool->blocks->s, pool->start, (pool->end-pool->start)*sizeof(XML_Char)); memmove(pool->blocks->s, pool->start, (pool->end-pool->start)*sizeof(XML_Char));
pool->ptr=pool->blocks->s+(pool->ptr-pool->start); pool->ptr=pool->blocks->s+(pool->ptr-pool->start);
@@ -2733,7 +2734,8 @@ static int poolGrow(STRING_POOL *pool)
pool->blocks=tem; pool->blocks=tem;
memmove(tem->s, pool->start, (pool->ptr-pool->start)*sizeof(XML_Char)); //FIXME: pool->start seems to be a null pointer in some constellations, eg. with disabled pugixml, memmove don't like NULL-pointer for parameter 2 if (pool->start)
memmove(tem->s, pool->start, (pool->ptr-pool->start)*sizeof(XML_Char));
pool->ptr=tem->s+(pool->ptr-pool->start); pool->ptr=tem->s+(pool->ptr-pool->start);
pool->start=tem->s; pool->start=tem->s;