Avoid access violation in assertion.

xmlParser->pCurElement was dereferenced before null check.
Affects debug build only.
(cherry picked from commit 71ab707e817379c45563ca01f2aadc1959b00829)
This commit is contained in:
Yoichi NAKAYAMA 2012-03-07 22:41:42 +09:00 committed by Marcelo Roberto Jimenez
parent 0b2a4e580e
commit 5a9dbdb84e
2 changed files with 10 additions and 3 deletions

View File

@ -299,6 +299,13 @@ Version 1.8.0
Version 1.6.16
*******************************************************************************
2012-03-07 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Avoid access violation in assertion.
xmlParser->pCurElement was dereferenced before null check.
Affects debug build only.
2012-03-07 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
Remove SIZEOF_MISTACH error in notify_send_and_recv

View File

@ -2254,14 +2254,14 @@ static int Parser_isValidEndElement(
IXML_Node *newNode)
{
assert(xmlParser);
assert(xmlParser->pCurElement->element);
assert(newNode);
assert(newNode->nodeName);
if (xmlParser->pCurElement == NULL) {
return 0;
}
assert(xmlParser->pCurElement->element);
assert(newNode);
assert(newNode->nodeName);
return strcmp(xmlParser->pCurElement->element, newNode->nodeName) == 0;
}