From 5a9dbdb84eca3d0041e8288547e5bc7995ca439f Mon Sep 17 00:00:00 2001
From: Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
Date: Wed, 7 Mar 2012 22:41:42 +0900
Subject: [PATCH] Avoid access violation in assertion.

xmlParser->pCurElement was dereferenced before null check.
Affects debug build only.
(cherry picked from commit 71ab707e817379c45563ca01f2aadc1959b00829)
---
 ChangeLog             | 7 +++++++
 ixml/src/ixmlparser.c | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8385e64..7099cc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ixml/src/ixmlparser.c b/ixml/src/ixmlparser.c
index 54c0bfb..7fab80b 100644
--- a/ixml/src/ixmlparser.c
+++ b/ixml/src/ixmlparser.c
@@ -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;
 }