summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2012-01-18 10:22:39 +0100
committerMichael Vogt <egon@debian-devbox>2012-01-18 10:22:39 +0100
commita97c2991ab68ef77abdd5a13a1f49f08fa2755ff (patch)
treeaf9bd4e8a3cab104e3933e64e210e855253daed7
parent85e1885525977809ff6a3b70abb84d3a63e41817 (diff)
parentd0254ba7ea3f3de175d11cdc877cc4350692ba4a (diff)
* apt-pkg/contrib/fileutils.h:
- fix segfault from python-apt testsuite
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--debian/changelog6
2 files changed, 6 insertions, 2 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..b826f2a4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,11 @@ 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
- -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:29:07 +0100
+ [ Michael Vogt ]
+ * apt-pkg/contrib/fileutils.h:
+ - fix segfault from python-apt testsuite
+
+ -- Michael Vogt <mvo@debian.org> Tue, 17 Jan 2012 12:06:15 +0100
apt (0.8.16~exp9) experimental; urgency=low