From d575d779ade3477b672e0c007f2dff40d0619ecb Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 19 Nov 2005 11:20:13 +0000 Subject: [PATCH] (ef_ptr, ef_read): Undo rev. 1.52 for these two, because there are callers that rely on these functions to fail for bad ID. --- src/lib/common/file.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lib/common/file.c b/src/lib/common/file.c index d626f0cd..d710376e 100644 --- a/src/lib/common/file.c +++ b/src/lib/common/file.c @@ -212,10 +212,8 @@ ef_ptr(int type, int id) ep = &empfile[type]; if (CANT_HAPPEN(!(ep->flags & EFF_MEM) || !ep->cache)) return NULL; - if (id < 0 || id >= ep->fids) { - CANT_HAPPEN(id != ep->fids); + if (id < 0 || id >= ep->fids) return NULL; - } return ep->cache + ep->size * id; } @@ -235,10 +233,8 @@ ef_read(int type, int id, void *into) ep = &empfile[type]; if (CANT_HAPPEN(!ep->cache)) return 0; - if (id < 0 || id >= ep->fids) { - CANT_HAPPEN(id != ep->fids); + if (id < 0 || id >= ep->fids) return 0; - } if (ep->flags & EFF_MEM) { from = ep->cache + id * ep->size;