diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-07-19 15:20:10 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-07-26 13:15:27 +0000 |
| commit | 5db2f88fa537b851eba1ec26ec4396854bed6f5b (patch) | |
| tree | 5b4c21ad16f777fb1964c7a77561128d4cf904b0 | |
| parent | e7198df48408b71037b055915b8ee19933a4811a (diff) | |
| download | src-5db2f88fa537b851eba1ec26ec4396854bed6f5b.tar.gz src-5db2f88fa537b851eba1ec26ec4396854bed6f5b.zip | |
vtfontcvt: improve hex font format validation
Previously an EOF would result in sscanf returning -1 leading to a
crash.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 119db52f4228fae161306ac29dc739638c132c26)
| -rw-r--r-- | usr.bin/vtfontcvt/vtfontcvt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index 7553d66d99d2..40ff866e0c5f 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -450,7 +450,7 @@ parse_hex(FILE *fp, unsigned int map_idx) if (bytes != NULL) errx(1, "malformed input: Width tag after font data"); set_width(atoi(ln + 9)); - } else if (sscanf(ln, "%6x:", &curchar)) { + } else if (sscanf(ln, "%6x:", &curchar) == 1) { if (bytes == NULL) { bytes = xmalloc(wbytes * height); bytes_r = xmalloc(wbytes * height); |