From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 16 Jan 2012 21:19:54 +0000 (+0100)
Subject: * apt-pkg/contrib/fileutils.h:
X-Git-Tag: 0.9.0~33^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d0254ba7ea3f3de175d11cdc877cc4350692ba4a

* apt-pkg/contrib/fileutils.h:
  - fix segfault from python-apt testsuite
---

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