Fix errorPos for malformed URIs with IPvFuture addresses

ChangeLog

@@ -10,6 +10,10 @@ NOTE: uriparser is looking for help with a few things:
       mitigated if passed parameter <afterLast> points to readable memory
       containing a '\0' byte.
       Thanks to Joergen Ibsen for the report!
+  * Fixed: When parsing a malformed URI with an IPvFuture address
+      (e.g. "http://[vA.123456" missing "]"), errorPos would point to the first
+      character after "v" than the actual position of the error (here: the end
+      of the string)
   * Fixed: uriToStringCharsRequired* reported 1 more byte than actually needed
       for IPv4 address URIs (GitHub #41); Thanks to @gyh007 for the patch!
   * Fixed: Compilation with MinGW

src/UriParse.c

@@ -544,9 +544,12 @@ static URI_INLINE const URI_CHAR * URI_FUNC(ParseIpLit2)(
 			if (afterIpFuture == NULL) {
 				return NULL;
 			}
-			if ((afterIpFuture >= afterLast)
-					|| (*afterIpFuture != _UT(']'))) {
-				URI_FUNC(StopSyntax)(state, first, memory);
+			if (afterIpFuture >= afterLast) {
+				URI_FUNC(StopSyntax)(state, afterLast, memory);
+				return NULL;
+			}
+			if (*afterIpFuture != _UT(']')) {
+				URI_FUNC(StopSyntax)(state, afterIpFuture, memory);
 				return NULL;
 			}
 			return afterIpFuture + 1;

test/test.cpp

@@ -2065,6 +2065,16 @@ TEST(UriSuite, TestRangeComparisonRemoveBaseUriIssue19) {
 								"http://example2/x/y/z");
 }
 
+TEST(ErrorPosSuite, TestErrorPosIPvFuture) {
+	UriUriA uri;
+	const char * errorPos;
+
+	const char * const uriText = "http://[vA.123456";  // missing "]"
+	EXPECT_EQ(uriParseSingleUriA(&uri, uriText, &errorPos),
+				URI_ERROR_SYNTAX);
+	EXPECT_EQ(errorPos, uriText + strlen(uriText));
+}
+
 TEST(UriParseSingleSuite, Success) {
 	UriUriA uri;