You have to do the bounds check before the access.

[apt.git] / methods / rsh.h

diff --git a/methods/rsh.h b/methods/rsh.h
index 34492971c32f87b3eecfff72b7b421a6b0d576df..dee4ad647fff45afa8adc2e77ab06c753e1e2c35 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -25,6 +25,7 @@ class RSHConn
    int WriteFd;
    int ReadFd;
    URI ServerName;
    int WriteFd;
    int ReadFd;
    URI ServerName;

+   std::string const Prog;

 
    // Private helper functions
    bool ReadLine(std::string &Text);
 
    // Private helper functions
    bool ReadLine(std::string &Text);


@@ -36,6 +37,7 @@ class RSHConn
    // Raw connection IO
    bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
    bool Connect(std::string Host, std::string User);
    // Raw connection IO
    bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
    bool Connect(std::string Host, std::string User);

+   bool Connect(std::string Host, unsigned int Port, std::string User);

    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    // Connection control
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    // Connection control


@@ -48,13 +50,13 @@ class RSHConn
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
             Hashes &Hash,bool &Missing, unsigned long long Size);
 
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
             Hashes &Hash,bool &Missing, unsigned long long Size);
 

-   RSHConn(URI Srv);
+   RSHConn(std::string const &Prog, URI Srv);

    ~RSHConn();
 };
 
    ~RSHConn();
 };
 

-#include <apt-pkg/acquire-method.h>
+#include "aptmethod.h"

 
 

-class RSHMethod : public pkgAcqMethod
+class RSHMethod : public aptMethod

 {
    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    virtual bool Configuration(std::string Message) APT_OVERRIDE;
 {
    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    virtual bool Configuration(std::string Message) APT_OVERRIDE;


@@ -68,7 +70,7 @@ class RSHMethod : public pkgAcqMethod
 
    public:
 
 
    public:
 

-   RSHMethod();
+   explicit RSHMethod(std::string &&Prog);

 };
 
 #endif
 };
 
 #endif