tests: don't do boundless string compares with data()

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 8fd0ac6177a1a23828d6ca1cdf6bca6bab5712fd..a9d51a6bfdfb1625826d5f23e2ec4d886251350e 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -2401,7 +2401,7 @@ FileFd::~FileFd()
    gracefully. */
 bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {
    gracefully. */
 bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {

-   if (d == nullptr)
+   if (d == nullptr || Failed())

       return false;
    ssize_t Res = 1;
    errno = 0;
       return false;
    ssize_t Res = 1;
    errno = 0;


@@ -2443,6 +2443,37 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
    }
 
    return FileFdError(_("read, still have %llu to read but none left"), Size);
    }
 
    return FileFdError(_("read, still have %llu to read but none left"), Size);

+}
+bool FileFd::Read(int const Fd, void *To, unsigned long long Size, unsigned long long * const Actual)
+{
+   ssize_t Res = 1;
+   errno = 0;
+   if (Actual != nullptr)
+      *Actual = 0;
+   *static_cast<char *>(To) = '\0';
+   while (Res > 0 && Size > 0)
+   {
+      Res = read(Fd, To, Size);
+      if (Res < 0)
+      {
+        if (errno == EINTR)
+        {
+           Res = 1;
+           errno = 0;
+           continue;
+        }
+        return _error->Errno("read", _("Read error"));
+      }
+      To = static_cast<char *>(To) + Res;
+      Size -= Res;
+      if (Actual != 0)
+        *Actual += Res;
+   }
+   if (Size == 0)
+      return true;
+   if (Actual != nullptr)
+      return true;
+   return _error->Error(_("read, still have %llu to read but none left"), Size);

 }
                                                                        /*}}}*/
 // FileFd::ReadLine - Read a complete line from the file               /*{{{*/
 }
                                                                        /*}}}*/
 // FileFd::ReadLine - Read a complete line from the file               /*{{{*/


@@ -2452,7 +2483,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 char* FileFd::ReadLine(char *To, unsigned long long const Size)
 {
    *To = '\0';
 char* FileFd::ReadLine(char *To, unsigned long long const Size)
 {
    *To = '\0';

-   if (d == nullptr)
+   if (d == nullptr || Failed())

       return nullptr;
    return d->InternalReadLine(To, Size);
 }
       return nullptr;
    return d->InternalReadLine(To, Size);
 }


@@ -2460,6 +2491,8 @@ char* FileFd::ReadLine(char *To, unsigned long long const Size)
 // FileFd::Flush - Flush the file                                      /*{{{*/
 bool FileFd::Flush()
 {
 // FileFd::Flush - Flush the file                                      /*{{{*/
 bool FileFd::Flush()
 {

+   if (Failed())
+      return false;

    if (d == nullptr)
       return true;
 
    if (d == nullptr)
       return true;
 


@@ -2469,7 +2502,7 @@ bool FileFd::Flush()
 // FileFd::Write - Write to the file                                   /*{{{*/
 bool FileFd::Write(const void *From,unsigned long long Size)
 {
 // FileFd::Write - Write to the file                                   /*{{{*/
 bool FileFd::Write(const void *From,unsigned long long Size)
 {

-   if (d == nullptr)
+   if (d == nullptr || Failed())

       return false;
    ssize_t Res = 1;
    errno = 0;
       return false;
    ssize_t Res = 1;
    errno = 0;


@@ -2525,7 +2558,7 @@ bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
 // FileFd::Seek - Seek in the file                                     /*{{{*/
 bool FileFd::Seek(unsigned long long To)
 {
 // FileFd::Seek - Seek in the file                                     /*{{{*/
 bool FileFd::Seek(unsigned long long To)
 {

-   if (d == nullptr)
+   if (d == nullptr || Failed())

       return false;
    Flags &= ~HitEof;
    return d->InternalSeek(To);
       return false;
    Flags &= ~HitEof;
    return d->InternalSeek(To);


@@ -2534,7 +2567,7 @@ bool FileFd::Seek(unsigned long long To)
 // FileFd::Skip - Skip over data in the file                           /*{{{*/
 bool FileFd::Skip(unsigned long long Over)
 {
 // FileFd::Skip - Skip over data in the file                           /*{{{*/
 bool FileFd::Skip(unsigned long long Over)
 {

-   if (d == nullptr)
+   if (d == nullptr || Failed())

       return false;
    return d->InternalSkip(Over);
 }
       return false;
    return d->InternalSkip(Over);
 }


@@ -2542,7 +2575,7 @@ bool FileFd::Skip(unsigned long long Over)
 // FileFd::Truncate - Truncate the file                                        /*{{{*/
 bool FileFd::Truncate(unsigned long long To)
 {
 // FileFd::Truncate - Truncate the file                                        /*{{{*/
 bool FileFd::Truncate(unsigned long long To)
 {

-   if (d == nullptr)
+   if (d == nullptr || Failed())

       return false;
    // truncating /dev/null is always successful - as we get an error otherwise
    if (To == 0 && FileName == "/dev/null")
       return false;
    // truncating /dev/null is always successful - as we get an error otherwise
    if (To == 0 && FileName == "/dev/null")


@@ -2555,7 +2588,7 @@ bool FileFd::Truncate(unsigned long long To)
 /* */
 unsigned long long FileFd::Tell()
 {
 /* */
 unsigned long long FileFd::Tell()
 {

-   if (d == nullptr)
+   if (d == nullptr || Failed())

       return false;
    off_t const Res = d->InternalTell();
    if (Res == (off_t)-1)
       return false;
    off_t const Res = d->InternalTell();
    if (Res == (off_t)-1)


@@ -2618,7 +2651,7 @@ time_t FileFd::ModificationTime()
 unsigned long long FileFd::Size()
 {
    if (d == nullptr)
 unsigned long long FileFd::Size()
 {
    if (d == nullptr)

-      return false;
+      return 0;

    return d->InternalSize();
 }
                                                                        /*}}}*/
    return d->InternalSize();
 }
                                                                        /*}}}*/