From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 9 Sep 2010 09:26:18 +0000 (+0200)
Subject: * ftparchive/writer.cc:
X-Git-Tag: 0.8.4~4^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/cdb623ed0bcdf847544a20c0b3924ff129d85746?ds=inline;hp=-c

* ftparchive/writer.cc:
  - null the valid string instead of the date if Valid-Until is not set
---

cdb623ed0bcdf847544a20c0b3924ff129d85746
diff --git a/debian/changelog b/debian/changelog
index 47b1eefae..bf2459a03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.8.4) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * ftparchive/writer.cc:
+    - null the valid string instead of the date if Valid-Until is not set
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 09 Sep 2010 11:25:54 +0200
+
 apt (0.8.3) unstable; urgency=low
 
   [ Manpages translations ]
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 58e32dade..858e0d9df 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -925,12 +925,12 @@ ReleaseWriter::ReleaseWriter(string const &DB)
    }
 
    time_t const validuntil = now + _config->FindI("APT::FTPArchive::Release::ValidTime", 0);
-   char validstr[128] = "";
+   char validstr[128];
    if (now == validuntil ||
        strftime(validstr, sizeof(validstr), "%a, %d %b %Y %H:%M:%S UTC",
                 gmtime(&validuntil)) == 0)
    {
-      datestr[0] = '\0';
+      validstr[0] = '\0';
    }
 
    map<string,string> Fields;