LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Use new function parseint32 in SplitHostPort

Browse source 
Use the new function parseint32 in SplitHostPort instead of calling
strtol directly.
This commit is contained in:
Wladimir J. van der Laan 2014-05-03 10:25:58 +02:00
parent 0d4ea1cf8a
commit d864275299
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/netbase.cpp
View file

@ -47,12 +47,10 @@ void SplitHostPort(std::string in, int &portOut, std::string &hostOut) {
bool fBracketed = fHaveColon && (in[0]=='[' && in[colon-1]==']'); // if there is a colon, and in[0]=='[', colon is not 0, so in[colon-1] is safe bool fBracketed = fHaveColon && (in[0]=='[' && in[colon-1]==']'); // if there is a colon, and in[0]=='[', colon is not 0, so in[colon-1] is safe
bool fMultiColon = fHaveColon && (in.find_last_of(':',colon-1) != in.npos); bool fMultiColon = fHaveColon && (in.find_last_of(':',colon-1) != in.npos);
if (fHaveColon && (colon==0 || fBracketed || !fMultiColon)) { if (fHaveColon && (colon==0 || fBracketed || !fMultiColon)) {
char *endp = NULL; int32_t n;
int n = strtol(in.c_str() + colon + 1, &endp, 10); if (ParseInt32(in.substr(colon + 1), &n) && n > 0 && n < 0x10000) {
if (endp && *endp == 0 && n >= 0) {
in = in.substr(0, colon); in = in.substr(0, colon);
if (n > 0 && n < 0x10000) portOut = n;
portOut = n;
} }
} }
if (in.size()>0 && in[0] == '[' && in[in.size()-1] == ']') if (in.size()>0 && in[0] == '[' && in[in.size()-1] == ']')