xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add Etoolong error string, cleanup genbuf truncation fix

Browse source
This commit is contained in:
cinap_lenrek 2012-02-08 02:32:03 +01:00
parent 022fd02b96
commit 061d55111b
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/src/9/port/devenv.c
View file

@ -48,7 +48,7 @@ envgen(Chan *c, char *name, Dirtab*, int, int s, Dir *dp)
else if(s < eg->nent)
e = eg->ent[s];
if(e == 0 || (strlen(e->name) >= sizeof(up->genbuf))) {
if(e == 0 || name && (strlen(e->name) >= sizeof(up->genbuf))) {
runlock(eg);
return -1;
}
@ -148,7 +148,7 @@ envcreate(Chan *c, char *name, int omode, ulong)
error(Eperm);
if(strlen(name) >= sizeof(up->genbuf))
error(Egreg);
error(Etoolong);
omode = openmode(omode);
eg = envgrp(c);

3
sys/src/9/port/devflash.c
View file

@ -403,7 +403,8 @@ flashnewpart(Flash *f, char *name, ulong start, ulong end)
}
if((fp = empty) == nil)
return "partition table full";
// fp->name = nil;
if(strlen(name)+3 >= sizeof(up->genbuf))
return Etoolong;
kstrdup(&fp->name, name);
if(fp->name == nil)
return Enomem;

12
sys/src/9/port/devshr.c
View file

@ -304,7 +304,7 @@ shrgen(Chan *c, char*, Dirtab*, int, int s, Dir *dp)
qlock(&shrslk);
for(shr = shrs; shr && s; shr = shr->next)
s--;
if(shr == nil || (strlen(shr->name) >= sizeof(up->genbuf))){
if(shr == nil){
qunlock(&shrslk);
return -1;
}
@ -323,11 +323,11 @@ shrgen(Chan *c, char*, Dirtab*, int, int s, Dir *dp)
rlock(&h->lock);
for(m = h->mount; m && s; m = m->next)
s--;
mpt = tompt(m);
if(m == nil || (strlen(mpt->name) >= sizeof(up->genbuf))){
if(m == nil){
runlock(&h->lock);
return -1;
}
mpt = tompt(m);
kstrcpy(up->genbuf, mpt->name, sizeof up->genbuf);
devdir(c, shrqid(Qcmpt, mpt->id), up->genbuf, 0, mpt->owner, mpt->perm, dp);
runlock(&h->lock);
@ -461,7 +461,7 @@ shrcreate(Chan *c, char *name, int omode, ulong perm)
if((perm & DMDIR) == 0 || openmode(omode) != OREAD)
error(Eperm);
if(strlen(name) >= sizeof(up->genbuf))
error(Egreg);
error(Etoolong);
qlock(&shrslk);
if(waserror()){
qunlock(&shrslk);
@ -499,7 +499,7 @@ shrcreate(Chan *c, char *name, int omode, ulong perm)
devpermcheck(shr->owner, shr->perm, ORDWR);
if(strlen(name) >= sizeof(up->genbuf))
error(Egreg);
error(Etoolong);
h = &shr->umh;
wlock(&h->lock);
@ -657,7 +657,7 @@ shrwstat(Chan *c, uchar *dp, int n)
if(strchr(d.name, '/') != nil)
error(Ebadchar);
if(strlen(d.name) >= sizeof(up->genbuf))
error(Egreg);
error(Etoolong);
kstrdup(&ent->name, d.name);
}
poperror();

8
sys/src/9/port/devsrv.c
View file

@ -49,7 +49,7 @@ srvgen(Chan *c, char *name, Dirtab*, int, int s, Dir *dp)
for(sp = srv; sp && s; sp = sp->link)
s--;
}
if(sp == 0 || (strlen(sp->name) >= sizeof(up->genbuf))) {
if(sp == 0 || name && (strlen(sp->name) >= sizeof(up->genbuf))) {
qunlock(&srvlk);
return -1;
}
@ -148,7 +148,7 @@ srvcreate(Chan *c, char *name, int omode, ulong perm)
error(Eperm);
if(strlen(name) >= sizeof(up->genbuf))
error(Egreg);
error(Etoolong);
sp = smalloc(sizeof *sp);
sname = smalloc(strlen(name)+1);
@ -266,7 +266,7 @@ srvwstat(Chan *c, uchar *dp, int n)
if(strchr(d.name, '/') != nil)
error(Ebadchar);
if(strlen(d.name) >= sizeof(up->genbuf))
error(Egreg);
error(Etoolong);
kstrdup(&sp->name, d.name);
}
qunlock(&srvlk);
@ -307,7 +307,7 @@ srvwrite(Chan *c, void *va, long n, vlong)
char buf[32];
if(n >= sizeof buf)
error(Egreg);
error(Etoobig);
memmove(buf, va, n); /* so we can NUL-terminate */
buf[n] = 0;
fd = strtoul(buf, 0, 0);

1
sys/src/9/port/error.h
View file

@ -51,3 +51,4 @@ extern char Enegoff[]; /* negative i/o offset */
extern char Ecmdargs[]; /* wrong #args in control message */
extern char Ebadip[]; /* bad ip address syntax */
extern char Edirseek[]; /* seek in directory */
extern char Etoolong[]; /* name too long */