* some WS fixes

[apt.git] / apt-pkg / contrib / strutl.cc

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 4987307be38e2a7479eec6dc465f7318ef6bae0a..a75fbdf9292e4720e4fab6878deaa699aa8a28c5 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: strutl.cc,v 1.47 2003/02/02 22:20:27 jgg Exp $
+// $Id: strutl.cc,v 1.48 2003/07/18 14:15:11 mdz Exp $

 /* ######################################################################
 
    String Util - Some useful string functions.
 /* ######################################################################
 
    String Util - Some useful string functions.


@@ -652,7 +652,7 @@ bool ReadMessages(int Fd, vector<string> &List)
            continue;
         
         // Pull the message out
            continue;
         
         // Pull the message out

-        string Message(Buffer,0,I-Buffer);
+        string Message(Buffer,I-Buffer);

 
         // Fix up the buffer
         for (; I < End && *I == '\n'; I++);
 
         // Fix up the buffer
         for (; I < End && *I == '\n'; I++);


@@ -1045,7 +1045,7 @@ void URI::CopyFrom(string U)
       Path = "/";
 
    // Now we attempt to locate a user:pass@host fragment
       Path = "/";
 
    // Now we attempt to locate a user:pass@host fragment

-   if (FirstColon[1] == '/' && FirstColon[2] == '/')
+   if (FirstColon + 2 <= U.end() && FirstColon[1] == '/' && FirstColon[2] == '/')

       FirstColon += 3;
    else
       FirstColon += 1;
       FirstColon += 3;
    else
       FirstColon += 1;