From 88e3271ad66c923e0f4c83c08cdfeb9b2cf12eb1 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Tue, 23 Apr 2019 13:31:50 +0200
Subject: [PATCH] miniupnpc-libevent: update minixml.c/.h

---
 miniupnpc-libevent/minixml.c | 10 ++++++----
 miniupnpc-libevent/minixml.h |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/miniupnpc-libevent/minixml.c b/miniupnpc-libevent/minixml.c
index 3e201ec..935ec44 100644
--- a/miniupnpc-libevent/minixml.c
+++ b/miniupnpc-libevent/minixml.c
@@ -1,10 +1,11 @@
-/* $Id: minixml.c,v 1.11 2014/02/03 15:54:12 nanard Exp $ */
-/* minixml.c : the minimum size a xml parser can be ! */
+/* $Id: minixml.c,v 1.12 2017/12/12 11:17:40 nanard Exp $ */
+/* vim: tabstop=4 shiftwidth=4 noexpandtab
+ * minixml.c : the minimum size a xml parser can be ! */
 /* Project : miniupnp
  * webpage: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * Author : Thomas Bernard
 
-Copyright (c) 2005-2014, Thomas BERNARD
+Copyright (c) 2005-2017, Thomas BERNARD
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -161,7 +162,8 @@ static void parseelt(struct xmlparser * p)
 						if (p->xml >= p->xmlend)
 							return;
 					}
-					if(memcmp(p->xml, "<![CDATA[", 9) == 0)
+					/* CDATA are at least 9 + 3 characters long : <![CDATA[ ]]> */
+					if((p->xmlend >= (p->xml + (9 + 3))) && (memcmp(p->xml, "<![CDATA[", 9) == 0))
 					{
 						/* CDATA handling */
 						p->xml += 9;
diff --git a/miniupnpc-libevent/minixml.h b/miniupnpc-libevent/minixml.h
index 9f43aa4..0a9fc08 100644
--- a/miniupnpc-libevent/minixml.h
+++ b/miniupnpc-libevent/minixml.h
@@ -1,4 +1,4 @@
-/* $Id: minixml.h,v 1.7 2012/09/27 15:42:10 nanard Exp $ */
+/* $Id: minixml.h,v 1.8 2019/02/10 12:29:25 nanard Exp $ */
 /* minimal xml parser
  *
  * Project : miniupnp
@@ -10,7 +10,7 @@
  * */
 #ifndef MINIXML_H_INCLUDED
 #define MINIXML_H_INCLUDED
-#define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))
+#define IS_WHITE_SPACE(c) ((c)==' ' || (c)=='\t' || (c)=='\r' || (c)=='\n')
 
 /* if a callback function pointer is set to NULL,
  * the function is not called */