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

libplumb: allow attributes larger than 4096, set some malloc tags

Browse source
This commit is contained in:
mischief 2018-05-01 12:47:26 -07:00
parent e87ca8d976
commit d05b90f300
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sys/src/libplumb/mesg.c
View file

@ -76,15 +76,21 @@ quote(char *s, char *buf, char *bufe)
char* char*
plumbpackattr(Plumbattr *attr) plumbpackattr(Plumbattr *attr)
{ {
int n; int n, l;
Plumbattr *a; Plumbattr *a;
char *s, *t, *buf, *bufe; char *s, *t, *buf, *bufe;
if(attr == nil) if(attr == nil)
return nil; return nil;
if((buf = malloc(4096)) == nil) n = 0;
for(a=attr; a!=nil; a=a->next){
l = Strlen(a->value);
if(l > n)
n = l;
}
if((buf = malloc(n*2+3)) == nil)
return nil; return nil;
bufe = buf + 4096; bufe = buf + n*2+3;
n = 0; n = 0;
for(a=attr; a!=nil; a=a->next) for(a=attr; a!=nil; a=a->next)
n += Strlen(a->name) + 1 + Strlen(quote(a->value, buf, bufe)) + 1; n += Strlen(a->name) + 1 + Strlen(quote(a->value, buf, bufe)) + 1;
@ -221,9 +227,11 @@ plumbunpackattr(char *p)
char *q, *v, *buf, *bufe; char *q, *v, *buf, *bufe;
int c, quoting; int c, quoting;
if((buf = malloc(4096)) == nil) c = strlen(p) + 1;
if((buf = malloc(c)) == nil)
return nil; return nil;
bufe = buf + 4096; bufe = buf + c;
attr = prev = nil; attr = prev = nil;
while(*p!='\0' && *p!='\n'){ while(*p!='\0' && *p!='\n'){
while(*p==' ' || *p=='\t') while(*p==' ' || *p=='\t')
@ -340,6 +348,7 @@ plumbunpackpartial(char *buf, int n, int *morep)
m = malloc(sizeof(Plumbmsg)); m = malloc(sizeof(Plumbmsg));
if(m == nil) if(m == nil)
return nil; return nil;
setmalloctag(m, getcallerpc(&buf));
memset(m, 0, sizeof(Plumbmsg)); memset(m, 0, sizeof(Plumbmsg));
if(morep != nil) if(morep != nil)
*morep = 0; *morep = 0;
@ -384,7 +393,11 @@ plumbunpackpartial(char *buf, int n, int *morep)
Plumbmsg* Plumbmsg*
plumbunpack(char *buf, int n) plumbunpack(char *buf, int n)
{ {
return plumbunpackpartial(buf, n, nil); Plumbmsg *m;
m = plumbunpackpartial(buf, n, nil);
if(m != nil)
setmalloctag(m, getcallerpc(&buf));
return m;
} }
Plumbmsg* Plumbmsg*