1 files changed, 6 insertions, 4 deletions

diff --git a/src/unstable/url.cpp b/src/unstable/url.cpp
index f51f381..8106ce7 100644
--- a/src/unstable/url.cpp
+++ b/src/unstable/url.cpp
@@ -123,12 +123,14 @@ void Bu::Url::setProtocol( const Bu::String &sNewProto, bool bAutoSetPort )
 
 void Bu::Url::parseUserPass( Bu::String::const_iterator &i )
 {
-    Bu::String::const_iterator s = i.find('@');
-    if( !s )
+    Bu::String::const_iterator s;
+    for( s = i; s && *s != '/' && *s != '@'; s++ ) { }
+    if( !s || *s == '/')
         return;
 
-    Bu::String::const_iterator p = i.find(':');
-    if( p )
+    Bu::String::const_iterator p;
+    for( p = i.find(':'); p && *p != '/' && *p != ':'; p++ ) { }
+    if( p && *p == ':' )
     {
         sUser.set( i, p );
         sPass.set( p+1, s );