From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 6 Sep 2010 10:17:15 +0000 (+0200)
Subject: * methods/{gzip,bzip2}.cc:
X-Git-Tag: 0.8.2~1^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/cf1cdb3328dacde829db8bbb3db4f5373ac07d61

* methods/{gzip,bzip2}.cc:
  - empty files can never be valid archives (Closes: #595691)
---

diff --git a/debian/changelog b/debian/changelog
index 4dca62603..07196db25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ apt (0.8.2) UNRELEASED; urgency=low
   * cmdline/apt-key:
     - support also Dir::Etc::Trusted so that apt-key works in the same
       way as the library part which works with the trusted files
+  * methods/{gzip,bzip2}.cc:
+    - empty files can never be valid archives (Closes: #595691)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 04 Sep 2010 15:25:10 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 06 Sep 2010 12:16:58 +0200
 
 apt (0.8.1) unstable; urgency=low
 
diff --git a/methods/bzip2.cc b/methods/bzip2.cc
index 241f21c66..c668141a2 100644
--- a/methods/bzip2.cc
+++ b/methods/bzip2.cc
@@ -56,12 +56,9 @@ bool Bzip2Method::Fetch(FetchItem *Itm)
    // Open the source and destination files
    FileFd From(Path,FileFd::ReadOnly);
 
-   // if the file is empty, just rename it and return
-   if(From.Size() == 0) 
-   {
-      rename(Path.c_str(), Itm->DestFile.c_str());
-      return true;
-   }
+   // FIXME add an error message saying that empty files can't be valid archives
+   if(From.Size() == 0)
+      return false;
 
    int GzOut[2];   
    if (pipe(GzOut) < 0)
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 5b9b66b50..22cae9424 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -48,12 +48,9 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // Open the source and destination files
    FileFd From(Path,FileFd::ReadOnlyGzip);
 
-   // if the file is empty, just rename it and return
-   if(From.Size() == 0) 
-   {
-      rename(Path.c_str(), Itm->DestFile.c_str());
-      return true;
-   }
+   // FIXME add an error message saying that empty files can't be valid archives
+   if(From.Size() == 0)
+      return false;
 
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
    To.EraseOnFailure();