aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2019-06-16 13:35:53 +0000
committerEd Maste <emaste@FreeBSD.org>2019-06-16 13:35:53 +0000
commitfd0e3f7c9856ddfeea69840df142b23940aeb326 (patch)
treee793bf817be5fce65f52fa3842086a14d48f7bca
parentc6e475ff5ab177d1bfa2fe8eaf9678fd165649fa (diff)
Notes
-rw-r--r--usr.bin/vtfontcvt/vtfontcvt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c
index 5dae35cb77e68..938b7dbcebec6 100644
--- a/usr.bin/vtfontcvt/vtfontcvt.c
+++ b/usr.bin/vtfontcvt/vtfontcvt.c
@@ -383,7 +383,8 @@ parse_bdf(FILE *fp, unsigned int map_idx)
sscanf(ln + 4, "%d %d %d %d", &bbw, &bbh, &bbox,
&bboy) == 4) {
if (bbw < 1 || bbh < 1 || bbw > fbbw || bbh > fbbh ||
- bbox < fbbox || bboy < fbboy)
+ bbox < fbbox || bboy < fbboy ||
+ bbh + bboy > fbbh + fbboy)
errx(1, "broken bitmap with BBX %d %d %d %d at line %u",
bbw, bbh, bbox, bboy, linenum);
bbwbytes = howmany(bbw, 8);