diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-12-28 04:16:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-12-28 04:16:15 +0000 |
| commit | 0d63b0677296ee8930cb4443af885bae8aaebfbc (patch) | |
| tree | c83a33ee5bc6ee8ab165adc17958a8cf8c8a0056 | |
| parent | 3bf02812c56c677e002e0200d73648a03f753afb (diff) | |
correct snprintf return val mishandling; ok krw marco
| -rw-r--r-- | sys/scsi/ss_scanjet.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/scsi/ss_scanjet.c b/sys/scsi/ss_scanjet.c index 1d311ffbbd2..b2dc391ecc9 100644 --- a/sys/scsi/ss_scanjet.c +++ b/sys/scsi/ss_scanjet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss_scanjet.c,v 1.25 2003/05/06 23:16:51 krw Exp $ */ +/* $OpenBSD: ss_scanjet.c,v 1.26 2004/12/28 04:16:14 deraadt Exp $ */ /* $NetBSD: ss_scanjet.c,v 1.6 1996/05/18 22:58:01 christos Exp $ */ /* @@ -383,8 +383,9 @@ scanjet_set_window(ss, flags) struct ss_softc *ss; int flags; { - size_t len; char escape_codes[128]; + size_t len; + int n; snprintf(escape_codes, sizeof escape_codes, "\033*f%ldP\033*f%ldQ\033*f%ldX\033*f%ldY\033*a%dR\033*a%dS", @@ -438,14 +439,15 @@ scanjet_set_window(ss, flags) * attention. */ len = strlen(escape_codes); - len += snprintf(escape_codes + len, sizeof escape_codes - len, + n = snprintf(escape_codes + len, sizeof escape_codes - len, "\033*a%dG\033*a%dL\033*a%dK", ss->sio.scan_bits_per_pixel, (int)(ss->sio.scan_brightness) - 128, (int)(ss->sio.scan_contrast) - 128); - if (len >= sizeof escape_codes) + if (n >= sizeof escape_codes || n == -1) return (ENOMEM); + len += n; return (scanjet_ctl_write(ss, escape_codes, len, flags)); } |