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

Refuse to grow or truncate files with fixed size

Browse source 
Make ef_write() treat it like any other invalid write beyond the file
size: oops.  Be less harsh in ef_extend() and ef_truncate(): log an
error.
This commit is contained in:
Markus Armbruster 2011-05-04 20:51:54 +02:00
parent 7d2269b5ae
commit 79f289c365
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -543,6 +543,8 @@ ef_write(int type, int id, void *from)
ep = &empfile[type]; ep = &empfile[type];
if (CANT_HAPPEN((ep->flags & (EFF_MEM | EFF_PRIVATE)) == EFF_PRIVATE)) if (CANT_HAPPEN((ep->flags & (EFF_MEM | EFF_PRIVATE)) == EFF_PRIVATE))
return 0; return 0;
if (CANT_HAPPEN(ep->nent >= 0 && id >= ep->nent))
return 0; /* beyond fixed size */
new_seqno(ep, from); new_seqno(ep, from);
if (id >= ep->fids) { if (id >= ep->fids) {
/* beyond end of file */ /* beyond end of file */
@ -694,6 +696,10 @@ ef_extend(int type, int count)
if (ef_check(type) < 0) if (ef_check(type) < 0)
return 0; return 0;
ep = &empfile[type]; ep = &empfile[type];
if (ep->nent >= 0) {
logerror("Can't extend %s, its size is fixed", ep->name);
return 0;
}
if (!do_extend(ep, count)) if (!do_extend(ep, count))
return 0; return 0;
if (ep->onresize) if (ep->onresize)
@ -806,6 +812,10 @@ ef_truncate(int type, int count)
if (ef_check(type) < 0 || CANT_HAPPEN(EF_IS_VIEW(type))) if (ef_check(type) < 0 || CANT_HAPPEN(EF_IS_VIEW(type)))
return 0; return 0;
ep = &empfile[type]; ep = &empfile[type];
if (ep->nent >= 0) {
logerror("Can't truncate %s, its size is fixed", ep->name);
return 0;
}
if (CANT_HAPPEN(count < 0 || count > ep->fids)) if (CANT_HAPPEN(count < 0 || count > ep->fids))
return 0; return 0;