empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ef_open): Portability fix: malloc(0) may return null, which is not a

Browse source 
failure.  fillcache() chokes on null cache, so don't call it for empty
files.
This commit is contained in:
Markus Armbruster 2005-10-24 20:36:17 +00:00
parent 3eb3607f0d
commit 8b6549519b
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/common/file.c
View file

@ -95,17 +95,21 @@ ef_open(int type, int how)
else
ep->csize = max(1, blksize(fd) / ep->size);
size = ep->csize * ep->size;
if (size) {
ep->cache = malloc(size);
if (ep->cache == NULL) {
logerror("Can't open %s: out of memory", ep->file);
close(fd);
return 0;
}
} else {
ep->cache = NULL;
}
ep->baseid = 0;
ep->cids = 0;
ep->flags = (ep->flags & ~EFF_OPEN) | (how ^ ~EFF_CREATE);
ep->fd = fd;
if (how & EFF_MEM) {
if ((how & EFF_MEM) && ep->fids) {
if (fillcache(ep, 0) != ep->fids) {
ep->cids = 0; /* prevent cache flush */
ep->flags &= ~EFF_OPEN; /* maintain invariant */