summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/dpkgpm.cc1
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 395c3fb1a..9f0da3be6 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -660,6 +660,7 @@ bool pkgDPkgPM::OpenLog()
if (term_out == NULL)
return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
setvbuf(term_out, NULL, _IONBF, 0);
+ SetCloseExec(fileno(term_out), true);
chmod(logfile_name.c_str(), 0600);
fprintf(term_out, "\nLog started: %s\n", timestr);
}
diff --git a/debian/changelog b/debian/changelog
index 739f1b425..06065348e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ apt (0.8.7) UNRELEASED; urgency=low
* apt-pkg/deb/debsystem.cc:
- fix issues with dir::state::status and dir::state::extended_states
when alternative rootdirs are used
+ * apt-pkg/deb/dpkgpm.cc:
+ - ensure that history.log gets closed to avoid leaking a FD
+ (closes: #601649)
[ Martin Pitt ]
* apt-pkg/deb/debindexfile.cc: