cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-27 11:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle arbitrary length names in subfontname.

Browse source 
handle overflow in offset computation in font.c
This commit is contained in:
rsc 2005-05-12 16:55:14 +00:00
parent e354760aca
commit d4aef6a074
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libdraw/font.c
View file

@ -177,7 +177,7 @@ int
loadchar(Font *f, Rune r, Cacheinfo *c, int h, int noflush, char **subfontname)
{
int i, oi, wid, top, bottom;
Rune pic;
int pic; /* need >16 bits for adding offset below */
Fontchar *fi;
Cachefont *cf;
Cachesubf *subf, *of;
@ -270,10 +270,12 @@ loadchar(Font *f, Rune r, Cacheinfo *c, int h, int noflush, char **subfontname)
Found2:
subf->age = f->age;
/* possible overflow here, but works out okay */
pic += cf->offset;
if(pic-cf->min >= subf->f->n)
pic -= cf->min;
if(pic >= subf->f->n)
goto TryPJW;
fi = &subf->f->info[pic - cf->min];
fi = &subf->f->info[pic];
if(fi->width == 0)
goto TryPJW;
wid = (fi+1)->x - fi->x;

22
src/libdraw/subfontname.c
View file

@ -9,20 +9,22 @@
char*
subfontname(char *cfname, char *fname, int maxdepth)
{
char *t, *u, tmp1[64], tmp2[64];
char *t, *u, *tmp1, *tmp2;
int i;
t = strdup(cfname); /* t is the return string */
if(strcmp(cfname, "*default*") == 0)
return strdup(cfname);
t = cfname;
return t;
if(t[0] != '/'){
snprint(tmp2, sizeof tmp2, "%s", fname);
tmp2 = strdup(fname);
u = utfrrune(tmp2, '/');
if(u)
u[0] = 0;
else
strcpy(tmp2, ".");
snprint(tmp1, sizeof tmp1, "%s/%s", tmp2, t);
tmp1 = smprint("%s/%s", tmp2, t);
free(tmp2);
free(t);
t = tmp1;
}
@ -33,14 +35,16 @@ subfontname(char *cfname, char *fname, int maxdepth)
if((1<<i) > maxdepth)
continue;
/* try i-bit grey */
snprint(tmp2, sizeof tmp2, "%s.%d", t, i);
if(access(tmp2, AREAD) == 0)
return strdup(tmp2);
tmp2 = smprint("%s.%d", t, i);
if(access(tmp2, AREAD) == 0) {
free(t);
return tmp2;
}
}
/* try default */
if(access(t, AREAD) == 0)
return strdup(t);
return t;
return nil;
}