--- embedaddon/miniupnpd/upnpreplyparse.c	2012/02/21 23:16:02	1.1.1.1
+++ embedaddon/miniupnpd/upnpreplyparse.c	2012/05/29 12:55:57	1.1.1.2
@@ -1,7 +1,7 @@
-/* $Id: upnpreplyparse.c,v 1.1.1.1 2012/02/21 23:16:02 misho Exp $ */
+/* $Id: upnpreplyparse.c,v 1.1.1.2 2012/05/29 12:55:57 misho Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
- * (c) 2006 Thomas Bernard 
+ * (c) 2006-2011 Thomas Bernard 
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
@@ -27,22 +27,41 @@ NameValueParserGetData(void * d, const char * datas, i
 {
     struct NameValueParserData * data = (struct NameValueParserData *)d;
     struct NameValue * nv;
-    nv = malloc(sizeof(struct NameValue));
-    if(l>63)
-        l = 63;
-    strncpy(nv->name, data->curelt, 64);
-	nv->name[63] = '\0';
-    memcpy(nv->value, datas, l);
-    nv->value[l] = '\0';
-    LIST_INSERT_HEAD( &(data->head), nv, entries);
+	if(strcmp(data->curelt, "NewPortListing") == 0)
+	{
+		/* specific case for NewPortListing which is a XML Document */
+		data->portListing = malloc(l + 1);
+		if(!data->portListing)
+		{
+			/* malloc error */
+			return;
+		}
+		memcpy(data->portListing, datas, l);
+		data->portListing[l] = '\0';
+		data->portListingLength = l;
+	}
+	else
+	{
+		/* standard case. Limited to 63 chars strings */
+	    nv = malloc(sizeof(struct NameValue));
+	    if(l>63)
+	        l = 63;
+	    strncpy(nv->name, data->curelt, 64);
+		nv->name[63] = '\0';
+	    memcpy(nv->value, datas, l);
+	    nv->value[l] = '\0';
+	    LIST_INSERT_HEAD( &(data->head), nv, entries);
+	}
 }
 
 void
 ParseNameValue(const char * buffer, int bufsize,
-                    struct NameValueParserData * data)
+               struct NameValueParserData * data)
 {
     struct xmlparser parser;
     LIST_INIT(&(data->head));
+	data->portListing = NULL;
+	data->portListingLength = 0;
     /* init xmlparser object */
     parser.xmlstart = buffer;
     parser.xmlsize = bufsize;
@@ -58,6 +77,12 @@ void
 ClearNameValueList(struct NameValueParserData * pdata)
 {
     struct NameValue * nv;
+	if(pdata->portListing)
+	{
+		free(pdata->portListing);
+		pdata->portListing = NULL;
+		pdata->portListingLength = 0;
+	}
     while((nv = pdata->head.lh_first) != NULL)
     {
         LIST_REMOVE(nv, entries);