Parcourir la source

Fixed a uri parser bug
Author: jgg
Date: 1999-06-27 04:55:54 GMT
Fixed a uri parser bug

Arch Librarian il y a 22 ans
Parent
commit
1d38d0e9bf
1 fichiers modifiés avec 4 ajouts et 2 suppressions
  1. 4 2
      apt-pkg/contrib/strutl.cc

+ 4 - 2
apt-pkg/contrib/strutl.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: strutl.cc,v 1.25 1999/06/24 04:34:25 jgg Exp $
+// $Id: strutl.cc,v 1.26 1999/06/27 04:55:54 jgg Exp $
 /* ######################################################################
 /* ######################################################################
 
 
    String Util - Some usefull string functions.
    String Util - Some usefull string functions.
@@ -707,6 +707,8 @@ void URI::CopyFrom(string U)
    
    
    // Find the colon...
    // Find the colon...
    I = FirstColon + 1;
    I = FirstColon + 1;
+   if (I > SingleSlash)
+      I = SingleSlash;
    for (; I < SingleSlash && *I != ':'; I++);
    for (; I < SingleSlash && *I != ':'; I++);
    string::const_iterator SecondColon = I;
    string::const_iterator SecondColon = I;
    
    
@@ -728,7 +730,7 @@ void URI::CopyFrom(string U)
 	 Password = string(U,SecondColon - U.begin() + 1,At - SecondColon - 1);
 	 Password = string(U,SecondColon - U.begin() + 1,At - SecondColon - 1);
    }   
    }   
    
    
-   // Now we parse off a pot number from the hostname
+   // Now we parse off a port number from the hostname
    Port = 0;
    Port = 0;
    string::size_type Pos = Host.rfind(':');
    string::size_type Pos = Host.rfind(':');
    if (Pos == string::npos)
    if (Pos == string::npos)