breeze/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-02-08 01:33:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1273 from Barenboim/master

Browse Source 
Fix URIParser bug.
This commit is contained in:
xiehan
2023-05-05 20:52:13 +08:00
committed by GitHub
parent 1601c8b352 a1b83adfd0
commit baba9650f6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/URIParser.cc
View File

@@ -247,9 +247,9 @@ int URIParser::parse(const char *str, ParsedURI& uri)
int start_idx[URI_PART_ELEMENTS] = {0};
int end_idx[URI_PART_ELEMENTS] = {0};
int pre_state = URI_SCHEME;;
int i;
int pre_state = URI_SCHEME;
bool in_ipv6 = false;
int i;
for (i = 0; str[i]; i++)
{
@@ -268,7 +268,7 @@ int URIParser::parse(const char *str, ParsedURI& uri)
pre_state = URI_HOST;
i += 2;
if (str[i] == '[')
in_ipv6= true;
in_ipv6 = true;
else
start_idx[URI_USERINFO] = i;
@@ -341,6 +341,7 @@ int URIParser::parse(const char *str, ParsedURI& uri)
break;
}
}
if (pre_state != URI_PART_ELEMENTS)
end_idx[pre_state] = i;
@@ -369,6 +370,7 @@ int URIParser::parse(const char *str, ParsedURI& uri)
break;
}
}
end_idx[pre_state] = i + strlen(str + i);
}
@@ -398,13 +400,15 @@ int URIParser::parse(const char *str, ParsedURI& uri)
return -1;
}
if (i == URI_HOST && str[start_idx[i]] == '[')
if (i == URI_HOST && str[start_idx[i]] == '[' &&
str[end_idx[i] - 1] == ']')
{
len -= 2;
memcpy(*dst[i], str + start_idx[i] + 1, len);
}
else
memcpy(*dst[i], str + start_idx[i], len);
(*dst[i])[len] = '\0';
}
else