Made ipv6 behave more like ipv4 (Doesn't have to end in space)

Fixed null ptr deref
rsyslog · Nov 25, 2017 · 192fa5a · 192fa5a
1 parent 6f694b9
commit 192fa5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/parser.c b/src/parser.c
@@ -1625,7 +1625,9 @@ PARSER_Parse(OpQuotedString)
 	    /* create JSON value to save quoted string contents */
 	    CHKN(cstr = strndup((char*)c + *offs + 1, *parsed - 2));
 	}
-	CHKN(*value = json_object_new_string(cstr));
+	if (value != NULL) {
+		CHKN(*value = json_object_new_string(cstr));
+	}
 
 	r = 0; /* success */
 done:
@@ -2139,11 +2141,14 @@ PARSER_Parse(IPv6)
 		if(skipIPv6AddrBlock(npb, &i) != 0) goto done;
 		nBlocks++;
 		if(i == npb->strLen) goto chk_ok;
-		if(isspace(c[i])) goto chk_ok;
+		/* no more valid chars, check address */
+		if(c[i] != ':' && c[i] != '.') goto chk_ok;
 		if(c[i] == '.'){ /* IPv4 processing! */
 			hasIPv4 = 1;
 			break;
 		}
+		/* maximum blocks consumed and not ipv4, check if valid */
+		if (nBlocks == 8) goto chk_ok;
 		if(c[i] != ':') goto done;
 		i++; /* "eat" ':' */
 		if(i == npb->strLen) goto chk_ok;

diff --git a/tests/field_ipv6.sh b/tests/field_ipv6.sh
@@ -41,7 +41,7 @@ execute 'ABCD:EF01:2345:6789:ABCD:EF01:2345::6789' # :: with too many blocks
 assert_output_json_eq '{ "originalmsg": "ABCD:EF01:2345:6789:ABCD:EF01:2345::6789", "unparsed-data": "ABCD:EF01:2345:6789:ABCD:EF01:2345::6789" }'
 
 execute 'ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798' # too many blocks (9)
-assert_output_json_eq '{"originalmsg": "ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798", "unparsed-data": "ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798" }'
+assert_output_json_eq '{"originalmsg": "ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798", "unparsed-data": ":6798" }'
 
 execute ':0:0:0:0:0:0:1' # missing first digit
 assert_output_json_eq '{ "originalmsg": ":0:0:0:0:0:0:1", "unparsed-data": ":0:0:0:0:0:0:1" }'

diff --git a/tests/field_ipv6_jsoncnf.sh b/tests/field_ipv6_jsoncnf.sh
@@ -41,7 +41,7 @@ execute 'ABCD:EF01:2345:6789:ABCD:EF01:2345::6789' # :: with too many blocks
 assert_output_json_eq '{ "originalmsg": "ABCD:EF01:2345:6789:ABCD:EF01:2345::6789", "unparsed-data": "ABCD:EF01:2345:6789:ABCD:EF01:2345::6789" }'
 
 execute 'ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798' # too many blocks (9)
-assert_output_json_eq '{"originalmsg": "ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798", "unparsed-data": "ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798" }'
+assert_output_json_eq '{"originalmsg": "ABCD:EF01:2345:6789:ABCD:EF01:2345:1:6798", "unparsed-data": ":6798" }'
 
 execute ':0:0:0:0:0:0:1' # missing first digit
 assert_output_json_eq '{ "originalmsg": ":0:0:0:0:0:0:1", "unparsed-data": ":0:0:0:0:0:0:1" }'