Make mysql parser more tolerant.

sogou · Aug 26, 2023 · 17b81b9 · 17b81b9
1 parent 1eb668c
commit 17b81b9
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/protocol/mysql_parser.c b/src/protocol/mysql_parser.c
@@ -207,11 +207,15 @@ static int parse_ok_packet(const void *buf, size_t len, mysql_parser_t *parser)
 		if (decode_string(&str, &info_len, &p, buf_end) == 0)
 			return -2;
 
-		if (server_status & MYSQL_SERVER_SESSION_STATE_CHANGED)
+		if (p != buf_end)
 		{
-			const unsigned char *tmp_str;
-			unsigned long long tmp_len;
-			if (decode_string(&tmp_str, &tmp_len, &p, buf_end) == 0)
+			if (server_status & MYSQL_SERVER_SESSION_STATE_CHANGED)
+			{
+				const unsigned char *tmp_str;
+				unsigned long long tmp_len;
+				if (decode_string(&tmp_str, &tmp_len, &p, buf_end) == 0)
+					return -2;
+			} else
 				return -2;
 		}
 	} else {