|
|
@@ -38,7 +38,7 @@
|
|
|
// ---------------------------------------------------------------------
|
|
|
/* */
|
|
|
MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
|
|
|
- Base(0), SyncToFd(NULL)
|
|
|
+ Base(nullptr), SyncToFd(nullptr)
|
|
|
{
|
|
|
if ((Flags & NoImmMap) != NoImmMap)
|
|
|
Map(F);
|
|
|
@@ -48,7 +48,7 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
|
|
|
// ---------------------------------------------------------------------
|
|
|
/* */
|
|
|
MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),
|
|
|
- Base(0), SyncToFd(NULL)
|
|
|
+ Base(nullptr), SyncToFd(nullptr)
|
|
|
{
|
|
|
}
|
|
|
/*}}}*/
|
|
|
@@ -84,6 +84,8 @@ bool MMap::Map(FileFd &Fd)
|
|
|
if ((Flags & ReadOnly) != ReadOnly)
|
|
|
return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str());
|
|
|
Base = malloc(iSize);
|
|
|
+ if (unlikely(Base == nullptr))
|
|
|
+ return _error->Errno("MMap-compressed-malloc", _("Couldn't make mmap of %llu bytes"), iSize);
|
|
|
SyncToFd = new FileFd();
|
|
|
if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false)
|
|
|
return _error->Error("Compressed file %s can't be read into mmap", Fd.Name().c_str());
|
|
|
@@ -92,7 +94,7 @@ bool MMap::Map(FileFd &Fd)
|
|
|
|
|
|
// Map it.
|
|
|
Base = (Flags & Fallback) ? MAP_FAILED : mmap(0,iSize,Prot,Map,Fd.Fd(),0);
|
|
|
- if (Base == (void *)-1)
|
|
|
+ if (Base == MAP_FAILED)
|
|
|
{
|
|
|
if (errno == ENODEV || errno == EINVAL || (Flags & Fallback))
|
|
|
{
|
|
|
@@ -102,6 +104,8 @@ bool MMap::Map(FileFd &Fd)
|
|
|
{
|
|
|
// for readonly, we don't need sync, so make it simple
|
|
|
Base = malloc(iSize);
|
|
|
+ if (unlikely(Base == nullptr))
|
|
|
+ return _error->Errno("MMap-malloc", _("Couldn't make mmap of %llu bytes"), iSize);
|
|
|
SyncToFd = new FileFd();
|
|
|
return Fd.Read(Base, iSize);
|
|
|
}
|
|
|
@@ -111,13 +115,14 @@ bool MMap::Map(FileFd &Fd)
|
|
|
return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd());
|
|
|
|
|
|
Base = calloc(iSize, 1);
|
|
|
+ if (unlikely(Base == nullptr))
|
|
|
+ return _error->Errno("MMap-calloc", _("Couldn't make mmap of %llu bytes"), iSize);
|
|
|
SyncToFd = new FileFd (dupped_fd);
|
|
|
if (!SyncToFd->Seek(0L) || !SyncToFd->Read(Base, iSize))
|
|
|
return false;
|
|
|
}
|
|
|
else
|
|
|
- return _error->Errno("mmap",_("Couldn't make mmap of %llu bytes"),
|
|
|
- iSize);
|
|
|
+ return _error->Errno("MMap-mmap", _("Couldn't make mmap of %llu bytes"), iSize);
|
|
|
}
|
|
|
|
|
|
return true;
|