Просмотр исходного кода

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

Michael Vogt лет назад: 14
Родитель
Сommit
d0254ba7ea
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 1
      apt-pkg/contrib/fileutl.h
  2. 4 0
      debian/changelog

+ 1 - 1
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;};

+ 4 - 0
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