summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-01-16 22:19:54 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-01-16 22:19:54 +0100
commitd0254ba7ea3f3de175d11cdc877cc4350692ba4a (patch)
tree8029a1298467bd9ca44fb90c94354599cc90a56d
parente70c1d067335bfa686fa0c6e75e32afb095e1aaa (diff)
* apt-pkg/contrib/fileutils.h:
- fix segfault from python-apt testsuite
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 147535df1..3814cfe44 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -115,7 +115,7 @@ class FileFd
// Simple manipulators
inline int Fd() {return iFd;};
- inline void Fd(int fd) {iFd = fd;};
+ inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);};
__deprecated gzFile gzFd();
inline bool IsOpen() {return iFd >= 0;};
diff --git a/debian/changelog b/debian/changelog
index 5eb4e593f..2e8bcfb13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ apt (0.8.16~exp10) UNRELEASED; urgency=low
- check if dpkg supports multiarch with --assert-multi-arch
and if it does be always explicit about the architecture
+ [ Michael Vogt ]
+ * apt-pkg/contrib/fileutils.h:
+ - fix segfault from python-apt testsuite
+
-- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:29:07 +0100
apt (0.8.16~exp9) experimental; urgency=low