GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in URL parsing.

Browse Source
This commit is contained in:
Vincent Richard 2004-12-26 16:42:30 +00:00
parent 3db93880fd
commit 057e8a4cfa
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/messaging/url.cpp
View File

@ -143,26 +143,34 @@ void url::parse(const string& str)
string username; string username;
string password; string password;
if (atPos != string::npos && atPos < slashPos) if (proto == PROTOCOL_FILE)
{ {
const string userPart(str.begin() + protoEnd, str.begin() + atPos); // No user name, password and host part.
const string::size_type colonPos = userPart.find(':'); slashPos = protoEnd + 3;
if (colonPos == string::npos)
{
username = userPart;
}
else
{
username = string(userPart.begin(), userPart.begin() + colonPos);
password = string(userPart.begin() + colonPos + 1, userPart.end());
}
hostPart = string(str.begin() + atPos + 1, str.begin() + slashPos);
} }
else else
{ {
hostPart = string(str.begin() + protoEnd, str.begin() + slashPos); if (atPos != string::npos && atPos < slashPos)
{
const string userPart(str.begin() + protoEnd + 3, str.begin() + atPos);
const string::size_type colonPos = userPart.find(':');
if (colonPos == string::npos)
{
username = userPart;
}
else
{
username = string(userPart.begin(), userPart.begin() + colonPos);
password = string(userPart.begin() + colonPos + 1, userPart.end());
}
hostPart = string(str.begin() + atPos + 1, str.begin() + slashPos);
}
else
{
hostPart = string(str.begin() + protoEnd + 3, str.begin() + slashPos);
}
} }
// Host/port // Host/port
@ -182,7 +190,7 @@ void url::parse(const string& str)
} }
// Path // Path
string path(str.begin() + slashPos, str.end()); string path = stringUtils::trim(string(str.begin() + slashPos, str.end()));
if (path == "/") if (path == "/")
path.clear(); path.clear();