DO NOT MERGE: Use correct limit for port values

Brian C. Young · andi34 · commit eb6c34238d55 · 2017-06-16T19:57:27.000+02:00
no upstream report yet, add it here when we have it
issue found &amp; patch by nmehta@

Bug: 36555370
Change-Id: Ibf1efea554b95f514e23e939363d608021de4614
(cherry picked from commit b62884fb49fe92081e414966d9b5fe58250ae53c)
diff --git a/uri.c b/uri.c
@@ -12,6 +12,7 @@
 #include "libxml.h"
 
 #include <string.h>
+#include <limits.h>
 
 #include <libxml/xmlmemory.h>
 #include <libxml/uri.h>
@@ -303,6 +304,8 @@ xmlParse3986Port(xmlURIPtr uri, const char **str)
 		uri->port = uri->port * 10 + (*cur - '0');
 	    cur++;
 	}
+	if (uri != NULL)
+	    uri->port = uri->port & USHRT_MAX; /* port value modulo INT_MAX+1 */
 	*str = cur;
 	return(0);
     }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include "libxml.h"`
`13`	`13`
`14`	`14`	`#include <string.h>`
	`15`	`+#include <limits.h>`
`15`	`16`
`16`	`17`	`#include <libxml/xmlmemory.h>`
`17`	`18`	`#include <libxml/uri.h>`
`@@ -303,6 +304,8 @@ xmlParse3986Port(xmlURIPtr uri, const char **str)`
`303`	`304`	`uri->port = uri->port * 10 + (*cur - '0');`
`304`	`305`	`cur++;`
`305`	`306`	`}`
	`307`	`+ if (uri != NULL)`
	`308`	`+ uri->port = uri->port & USHRT_MAX; /* port value modulo INT_MAX+1 */`
`306`	`309`	`*str = cur;`
`307`	`310`	`return(0);`
`308`	`311`	`}`