File miniupnpc-integer-signedness-error-fix.diff of Package miniupnpc

Overview Repositories Revisions Requests Users Attributes Meta

File miniupnpc-integer-signedness-error-fix.diff of Package miniupnpc

diff -Naur miniupnpc-1.9.orig/miniwget.c miniupnpc-1.9/miniwget.c
--- miniupnpc-1.9.orig/miniwget.c	2013-10-07 12:07:43.000000000 +0200
+++ miniupnpc-1.9/miniwget.c	2017-05-23 16:51:24.062613438 +0200
@@ -228,10 +228,11 @@
 							goto end_of_stream;
 						}
 					}
-					bytestocopy = ((int)chunksize < (n - i))?chunksize:(unsigned int)(n - i);
+					/* it is guaranteed that (n >= i) */
+					bytestocopy = (chunksize < (unsigned int)(n - i))?chunksize:(unsigned int)(n - i);
 					if((content_buf_used + bytestocopy) > content_buf_len)
 					{
-						if(content_length >= (int)(content_buf_used + bytestocopy)) {
+						if((content_length >= 0) && ((unsigned int)content_length >= (content_buf_used + bytestocopy))) {
 							content_buf_len = content_length;
 						} else {
 							content_buf_len = content_buf_used + bytestocopy;
@@ -249,13 +250,14 @@
 			{
 				/* not chunked */
 				if(content_length > 0
-				   && (int)(content_buf_used + n) > content_length) {
+				   && (content_buf_used + n) > (unsigned int)content_length) {
 					/* skipping additional bytes */
 					n = content_length - content_buf_used;
 				}
 				if(content_buf_used + n > content_buf_len)
 				{
-					if(content_length >= (int)(content_buf_used + n)) {
+					if(content_length >= 0
+					   && (unsigned int)content_length >= (content_buf_used + n)) {
 						content_buf_len = content_length;
 					} else {
 						content_buf_len = content_buf_used + n;
@@ -268,7 +270,7 @@
 			}
 		}
 		/* use the Content-Length header value if available */
-		if(content_length > 0 && (int)content_buf_used >= content_length)
+		if(content_length > 0 && content_buf_used >= (unsigned int)content_length)
 		{
 #ifdef DEBUG
 			printf("End of HTTP content\n");

Places

File miniupnpc-integer-signedness-error-fix.diff of Package miniupnpc

Places