mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Replay r349333 by emaste accidentally reverted by r349352
vtfontcvt: improve .bdf validation Previously if we had a FONTBOUNDINGBOX or DWIDTH entry that had missing or invalid values and and failed sscanf, we would proceeded with partially initialized bounding box / device width variables. Reported by: afl (FONTBOUNDINGBOX) MFC with: r349100 Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
f5a95d9a07
commit
912a01b36d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=349353
|
@ -335,9 +335,11 @@ parse_bdf(FILE *fp, unsigned int map_idx)
|
|||
break;
|
||||
}
|
||||
}
|
||||
} else if (strncmp(ln, "FONTBOUNDINGBOX ", 16) == 0 &&
|
||||
sscanf(ln + 16, "%d %d %d %d", &fbbw, &fbbh, &fbbox,
|
||||
&fbboy) == 4) {
|
||||
} else if (strncmp(ln, "FONTBOUNDINGBOX ", 16) == 0) {
|
||||
if (sscanf(ln + 16, "%d %d %d %d", &fbbw, &fbbh, &fbbox,
|
||||
&fbboy) != 4)
|
||||
errx(1, "invalid FONTBOUNDINGBOX at line %u",
|
||||
linenum);
|
||||
set_width(fbbw);
|
||||
set_height(fbbh);
|
||||
break;
|
||||
|
@ -353,8 +355,9 @@ parse_bdf(FILE *fp, unsigned int map_idx)
|
|||
linenum++;
|
||||
ln[length - 1] = '\0';
|
||||
|
||||
if (strncmp(ln, "DWIDTH ", 7) == 0 &&
|
||||
sscanf(ln + 7, "%d %d", &dwidth, &dwy) == 2) {
|
||||
if (strncmp(ln, "DWIDTH ", 7) == 0) {
|
||||
if (sscanf(ln + 7, "%d %d", &dwidth, &dwy) != 2)
|
||||
errx(1, "invalid DWIDTH at line %u", linenum);
|
||||
if (dwy != 0 || (dwidth != fbbw && dwidth * 2 != fbbw))
|
||||
errx(1, "bitmap with unsupported DWIDTH %d %d at line %u",
|
||||
dwidth, dwy, linenum);
|
||||
|
|
Loading…
Reference in a new issue