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

(ef_ptr, ef_read): Undo rev. 1.52 for these two, because there are

Browse source 
callers that rely on these functions to fail for bad ID.
This commit is contained in:
Markus Armbruster 2005-11-19 11:20:13 +00:00
parent 69582d0d15
commit d575d779ad
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,10 +212,8 @@ ef_ptr(int type, int id)
ep = &empfile[type]; ep = &empfile[type];
if (CANT_HAPPEN(!(ep->flags & EFF_MEM) || !ep->cache)) if (CANT_HAPPEN(!(ep->flags & EFF_MEM) || !ep->cache))
return NULL; return NULL;
if (id < 0 || id >= ep->fids) { if (id < 0 || id >= ep->fids)
CANT_HAPPEN(id != ep->fids);
return NULL; return NULL;
}
return ep->cache + ep->size * id; return ep->cache + ep->size * id;
} }
@ -235,10 +233,8 @@ ef_read(int type, int id, void *into)
ep = &empfile[type]; ep = &empfile[type];
if (CANT_HAPPEN(!ep->cache)) if (CANT_HAPPEN(!ep->cache))
return 0; return 0;
if (id < 0 || id >= ep->fids) { if (id < 0 || id >= ep->fids)
CANT_HAPPEN(id != ep->fids);
return 0; return 0;
}
if (ep->flags & EFF_MEM) { if (ep->flags & EFF_MEM) {
from = ep->cache + id * ep->size; from = ep->cache + id * ep->size;