diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-10-08 07:50:05 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-10-08 07:50:05 +0000 |
| commit | a76a584e46e53dea1aeaf98735079833b08472d2 (patch) | |
| tree | 6f12da8dad6dde46cc253698f991d4beac8a073b | |
| parent | 611efb3c3d25091430f5d719867e0b12eb2533a5 (diff) | |
| parent | 325c0341a1b19de3c1569ce8a6ddadceb7eaf1b5 (diff) | |
Merge with Michael
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62
* leak fix for debian #250583
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63
* changelog update
| -rw-r--r-- | apt-pkg/contrib/mmap.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index bc22fba67..e395e6cc7 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -155,9 +155,9 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) unsigned long EndOfFile = Fd->Size(); if (EndOfFile > WorkSpace) WorkSpace = EndOfFile; - else + else if(WorkSpace > 0) { - Fd->Seek(WorkSpace); + Fd->Seek(WorkSpace - 1); char C = 0; Fd->Write(&C,sizeof(C)); } diff --git a/debian/changelog b/debian/changelog index ac1e0e663..1f504f2c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,10 @@ apt (0.6.41.1) unstable; urgency=low - patch-99: Added Galician translation - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed - * applied frensh man-page update (thanks to Philippe Batailler) + * applied french man-page update (thanks to Philippe Batailler) + (closes: #316318, #327456) + * fix leak in the mmap code, thanks to Daniel Burrows for the + patch (closes: #250583) -- |