From eea61f81c31bf023a27d60ba08b604bb1324e1f3 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Sun, 17 Jan 2016 19:36:11 +0100
Subject: [PATCH] improve printresponse() to consume all buffer bytes

---
 minissdpd/printresponse.c | 87 ++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/minissdpd/printresponse.c b/minissdpd/printresponse.c
index fe0eded..270c91f 100644
--- a/minissdpd/printresponse.c
+++ b/minissdpd/printresponse.c
@@ -1,5 +1,6 @@
 /* $Id: $ */
-/* Project : miniupnp
+/* vim: tabstop=4 shiftwidth=4 noexpandtab
+ * Project : miniupnp
  * website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * Author : Thomas BERNARD
  * copyright (c) 2005-2016 Thomas Bernard
@@ -36,48 +37,50 @@ void printresponse(const unsigned char * resp, int n)
 			putchar((resp[l] >= ' ' && resp[l] < 128) ? resp[l] : '.');
 		putchar('\n');
 	}
-	/* now parse and display all devices of response */
-	nresp = resp[0]; /* 1st byte : number of devices in response */
-	if(nresp == 0xff) {
-		/* notification */
-		notif_type = resp[1];
-		nresp = resp[2];
-		printf("Notification : ");
-		switch(notif_type) {
-		case NOTIF_NEW:	printf("new\n"); break;
-		case NOTIF_UPDATE:	printf("update\n"); break;
-		case NOTIF_REMOVE:	printf("remove\n"); break;
-		default:	printf("**UNKNOWN**\n");
+	for(p = resp; p < resp + n; ) {
+		/* now parse and display all devices of response */
+		nresp = p[0]; /* 1st byte : number of devices in response */
+		if(nresp == 0xff) {
+			/* notification */
+			notif_type = p[1];
+			nresp = p[2];
+			printf("Notification : ");
+			switch(notif_type) {
+			case NOTIF_NEW:	printf("new\n"); break;
+			case NOTIF_UPDATE:	printf("update\n"); break;
+			case NOTIF_REMOVE:	printf("remove\n"); break;
+			default:	printf("**UNKNOWN**\n");
+			}
+			p += 3;
+		} else {
+			p++;
+		}
+		for(i = 0; i < (int)nresp; i++) {
+			if(p >= resp + n)
+				goto error;
+			/*l = *(p++);*/
+			DECODELENGTH(l, p);
+			if(p + l > resp + n)
+				goto error;
+			printf("%d - %.*s\n", i, l, p); /* URL */
+			p += l;
+			if(p >= resp + n)
+				goto error;
+			/*l = *(p++);*/
+			DECODELENGTH(l, p);
+			if(p + l > resp + n)
+				goto error;
+			printf("    %.*s\n", l, p);	/* ST */
+			p += l;
+			if(p >= resp + n)
+				goto error;
+			/*l = *(p++);*/
+			DECODELENGTH(l, p);
+			if(p + l > resp + n)
+				goto error;
+			printf("    %.*s\n", l, p); /* USN */
+			p += l;
 		}
-		p = resp + 3;
-	} else {
-		p = resp + 1;
-	}
-	for(i = 0; i < (int)nresp; i++) {
-		if(p >= resp + n)
-			goto error;
-		/*l = *(p++);*/
-		DECODELENGTH(l, p);
-		if(p + l > resp + n)
-			goto error;
-		printf("%d - %.*s\n", i, l, p); /* URL */
-		p += l;
-		if(p >= resp + n)
-			goto error;
-		/*l = *(p++);*/
-		DECODELENGTH(l, p);
-		if(p + l > resp + n)
-			goto error;
-		printf("    %.*s\n", l, p);	/* ST */
-		p += l;
-		if(p >= resp + n)
-			goto error;
-		/*l = *(p++);*/
-		DECODELENGTH(l, p);
-		if(p + l > resp + n)
-			goto error;
-		printf("    %.*s\n", l, p); /* USN */
-		p += l;
 	}
 	return;
 error: