X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b35d2f5fa0e797bf7062a1a7448a5d54bb396071..7d8afa391c5cd04e797a2b41fe3b946631254995:/apt-pkg/contrib/mmap.cc diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index e12e077c6..0ac202aef 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: mmap.cc,v 1.8 1998/07/26 04:49:34 jgg Exp $ +// $Id: mmap.cc,v 1.10 1998/11/23 07:03:08 jgg Exp $ /* ###################################################################### MMap Class - Provides 'real' mmap or a faked mmap using read(). @@ -130,6 +130,9 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : MMap(F,Flags | NoImmMap), WorkSpace(WorkSpace) { + if (_error->PendingError() == true) + return; + unsigned long EndOfFile = Fd.Size(); Fd.Seek(WorkSpace); char C = 0; @@ -163,7 +166,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) iSize = Result + Size; // Just in case error check - if (Result > WorkSpace) + if (Result + Size > WorkSpace) { _error->Error("Dynamic MMap ran out of room"); return 0;