From 7388900f46fa85275514127d15d69da33ffff129 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 4 Jan 2020 11:08:11 +0100 Subject: [PATCH] Revert "xmlparse.cpp: add condition to avoid possible crash" This reverts commit 40633dcfb54c07da8a90eae87e316a4a9cffa5a0. Needs another solution. This Commtit breaks channel tuning without configure option --enable-pugixml Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3c9ae32bb93cd001c0954d405a745f4e625524eb Author: Thilo Graf Date: 2020-01-04 (Sat, 04 Jan 2020) ------------------ This commit was generated by Migit --- lib/xmltree/xmlparse.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/xmltree/xmlparse.cpp b/lib/xmltree/xmlparse.cpp index 75e5d3ebc..8da590cbe 100644 --- a/lib/xmltree/xmlparse.cpp +++ b/lib/xmltree/xmlparse.cpp @@ -2732,9 +2732,8 @@ static int poolGrow(STRING_POOL *pool) tem->next=pool->blocks; pool->blocks=tem; - if (!pool->start) return 0; //FIXME: hack: pool->start seems to be a null pointer in some constellations, memmove don't like such for parameter 2 - memmove(tem->s, pool->start, (pool->ptr-pool->start)*sizeof(XML_Char)); + 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 pool->ptr=tem->s+(pool->ptr-pool->start); pool->start=tem->s;