diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-21 00:31:24 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-21 00:31:24 +0000 |
commit | 4039bfd095cf448b01786b3c25f2f769b03a882e (patch) | |
tree | 251262941ec6660f064fa4dc26b16ed588968b87 /sys/arch/i386 | |
parent | 773adeed0e8380d092081b479380bbf8e7e0c2de (diff) |
no need to check for 0, it copes, spotted by beck
Diffstat (limited to 'sys/arch/i386')
-rw-r--r-- | sys/arch/i386/i386/procfs_machdep.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/procfs_machdep.c b/sys/arch/i386/i386/procfs_machdep.c index 22e8e11abb2..4b3814d11ee 100644 --- a/sys/arch/i386/i386/procfs_machdep.c +++ b/sys/arch/i386/i386/procfs_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procfs_machdep.c,v 1.2 2001/04/22 17:41:50 deraadt Exp $ */ +/* $OpenBSD: procfs_machdep.c,v 1.3 2005/04/21 00:31:23 deraadt Exp $ */ /* $NetBSD: procfs_machdep.c,v 1.6 2001/02/21 21:39:59 jdolecek Exp $ */ /* @@ -77,6 +77,10 @@ procfs_getcpuinfstr(char *buf, int *len) for (i = 0; i < 32; i++) { if (cpu_feature & (1 << i)) { l = snprintf(p, left, "%s ", i386_features[i]); + if (l == -1) + l = 0; + else if (l >= left) + l = left - 1; left -= l; p += l; if (left <= 0) @@ -99,6 +103,10 @@ procfs_getcpuinfstr(char *buf, int *len) cpuid_level >= 0 ? ((cpu_id >> 4) & 15) : 0, cpu_model ); + if (l == -1) + l = 0; + else if (l >= left) + l = left - 1; left -= l; p += l; @@ -110,6 +118,10 @@ procfs_getcpuinfstr(char *buf, int *len) else l = snprintf(p, left, "unknown\n"); + if (l == -1) + l = 0; + else if (l >= left) + l = left - 1; left -= l; p += l; if (left <= 0) @@ -123,6 +135,10 @@ procfs_getcpuinfstr(char *buf, int *len) #endif l = snprintf(p, left, "cpu MHz\t\t: unknown\n"); + if (l == -1) + l = 0; + else if (l >= left) + l = left - 1; left -= l; p += l; if (left <= 0) @@ -141,6 +157,10 @@ procfs_getcpuinfstr(char *buf, int *len) cpuid_level, (rcr0() & CR0_WP) ? "yes" : "no", featurebuf); + if (l == -1) + l = 0; + else if (l >= left) + l = left - 1; *len = (p + l) - buf; |