diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2019-06-16 13:51:45 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2019-06-16 13:51:45 +0000 |
| commit | 08584e2c48e958e1e636ae4a115642c415f7cfcb (patch) | |
| tree | b56d02e02b1d3ec16a53dba426e8eabd079bd02a /usr.bin/vtfontcvt | |
| parent | fd0e3f7c9856ddfeea69840df142b23940aeb326 (diff) | |
| download | src-08584e2c48e958e1e636ae4a115642c415f7cfcb.tar.gz src-08584e2c48e958e1e636ae4a115642c415f7cfcb.zip | |
Notes
Diffstat (limited to 'usr.bin/vtfontcvt')
| -rw-r--r-- | usr.bin/vtfontcvt/vtfontcvt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index 938b7dbcebec..02d4d1cae050 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -379,9 +379,10 @@ parse_bdf(FILE *fp, unsigned int map_idx) curchar = atoi(ln + 9); } else if (strncmp(ln, "DWIDTH ", 7) == 0) { dwidth = atoi(ln + 7); - } else if (strncmp(ln, "BBX ", 4) == 0 && - sscanf(ln + 4, "%d %d %d %d", &bbw, &bbh, &bbox, - &bboy) == 4) { + } else if (strncmp(ln, "BBX ", 4) == 0) { + if (sscanf(ln + 4, "%d %d %d %d", &bbw, &bbh, &bbox, + &bboy) != 4) + errx(1, "invalid BBX at line %u", linenum); if (bbw < 1 || bbh < 1 || bbw > fbbw || bbh > fbbh || bbox < fbbox || bboy < fbboy || bbh + bboy > fbbh + fbboy) |