From 7c7258b652be82b7572d9ede922c9ba0834bcaf9 Mon Sep 17 00:00:00 2001 From: Emre Kultursay Date: Tue, 24 Mar 2020 10:02:08 -0700 Subject: [PATCH] Fix parsing of IPv6 host:port inside brackets When using IPv6 host:port pairs, typically the host is put inside brackets, such as [2601:1234:...:0213]:5555, and the UriParser can handle this format. However, the Android infrastructure in LLDB assumes an additional brackets around the host:port pair, such that the entire host:port string can be treated as the host (which is used as an Android Serial Number), and UriParser cannot handle multiple brackets. Parsing inputs with such extra backets requires searching the closing bracket from the right. --- lldb/source/Utility/UriParser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/source/Utility/UriParser.cpp b/lldb/source/Utility/UriParser.cpp index a6172caa8c5..8169b0eee12 100644 --- a/lldb/source/Utility/UriParser.cpp +++ b/lldb/source/Utility/UriParser.cpp @@ -42,7 +42,7 @@ bool UriParser::Parse(llvm::StringRef uri, llvm::StringRef &scheme, // Extract hostname if (!host_port.empty() && host_port[0] == '[') { // hostname is enclosed with square brackets. - pos = host_port.find(']'); + pos = host_port.rfind(']'); if (pos == std::string::npos) return false; -- 2.23.0.windows.1