Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-08 09:05:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Share additional addresses via RsCertificate

Browse source
This commit is contained in:
Gioacchino Mazzurco 2018-03-03 00:08:56 +01:00
parent 8542abd4f0
commit bed856425f
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
13 changed files with 267 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libretroshare/src/util/rsurl.cc
View file

@ -34,10 +34,10 @@ RsUrl::RsUrl(const std::string& urlStr) : mPort(0), mHasPort(false)
RsUrl& RsUrl::fromString(const std::string& urlStr)
{
size_t urlSize = urlStr.size();
size_t endI = urlStr.size()-1;
size_t schemeEndI = urlStr.find(schemeSeparator);
if(schemeEndI == string::npos)
if(schemeEndI >= endI)
{
mScheme = urlStr;
return *this;
@ -46,15 +46,16 @@ RsUrl& RsUrl::fromString(const std::string& urlStr)
mScheme = urlStr.substr(0, schemeEndI);
size_t hostBeginI = schemeEndI + 3;
if(hostBeginI >= urlSize) return *this;
if(hostBeginI >= endI) return *this;
bool hasSquareBr = (urlStr[hostBeginI] == ipv6WrapOpen[0]);
size_t hostEndI;
if(hasSquareBr)
{
if(++hostBeginI >= urlSize) return *this;
if(++hostBeginI >= endI) return *this;
hostEndI = urlStr.find(ipv6WrapClose, hostBeginI);
mHost = urlStr.substr(hostBeginI, hostEndI - hostBeginI - 1);
++hostEndI;
}
else
{
@ -64,24 +65,25 @@ RsUrl& RsUrl::fromString(const std::string& urlStr)
hostEndI = min(hostEndI, urlStr.find(fragmentSeparator, hostBeginI));
mHost = urlStr.substr(hostBeginI, hostEndI - hostBeginI);
if(hostEndI == string::npos) return *this;
}
if( hostEndI >= endI ) return *this;
mHasPort = (sscanf(&urlStr[hostEndI], ":%hu", &mPort) == 1);
size_t pathBeginI = urlStr.find(pathSeparator, hostEndI);
size_t pathBeginI = urlStr.find(pathSeparator, hostBeginI);
size_t pathEndI = string::npos;
if(pathBeginI != string::npos)
if(pathBeginI < endI)
{
pathEndI = urlStr.find(querySeparator, pathBeginI);
pathEndI = min(pathEndI, urlStr.find(fragmentSeparator, pathBeginI));
mPath = UrlDecode(urlStr.substr(pathBeginI, pathEndI - pathBeginI));
if(pathEndI == string::npos) return *this;
if(pathEndI >= endI) return *this;
}
size_t queryBeginI = urlStr.find(querySeparator, schemeEndI);
size_t queryEndI = urlStr.find(fragmentSeparator, schemeEndI);
if(queryBeginI != string::npos)
size_t queryBeginI = urlStr.find(querySeparator, hostBeginI);
size_t queryEndI = urlStr.find(fragmentSeparator, hostBeginI);
if(queryBeginI < endI)
{
string qStr = urlStr.substr(queryBeginI+1, queryEndI-queryBeginI-1);
@ -96,14 +98,16 @@ RsUrl& RsUrl::fromString(const std::string& urlStr)
kPos = vEndPos+1;
assPos = qStr.find(queryAssign, vEndPos);
}
while(assPos != string::npos);
while(assPos < endI);
if(queryEndI == string::npos) return *this;
if(queryEndI >= endI) return *this;
}
size_t fragmentBeginI = urlStr.find(fragmentSeparator, schemeEndI);
if(fragmentBeginI != string::npos)
size_t fragmentBeginI = urlStr.find(fragmentSeparator, hostBeginI);
if(fragmentBeginI < endI)
mFragment = UrlDecode(urlStr.substr(++fragmentBeginI));
return *this;
}
std::string RsUrl::toString() const