diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-02-25 10:38:55 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-02-25 10:38:55 +0100 |
| commit | 90aaed43979c6b4e42b41ef8dc2a970df248c2c7 (patch) | |
| tree | d691df6b05851c7288798046e6d38d9c63b2f6c7 /moduli.c | |
| parent | - dtucker@cvs.openbsd.org 2007/02/22 12:58:40 (diff) | |
| download | openssh-90aaed43979c6b4e42b41ef8dc2a970df248c2c7.tar.xz openssh-90aaed43979c6b4e42b41ef8dc2a970df248c2c7.zip | |
- ray@cvs.openbsd.org 2007/02/24 03:30:11
[moduli.c]
- strlen returns size_t, not int.
- Pass full buffer size to fgets.
OK djm@, millert@, and moritz@.
Diffstat (limited to 'moduli.c')
| -rw-r--r-- | moduli.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: moduli.c,v 1.19 2006/11/06 21:25:28 markus Exp $ */ +/* $OpenBSD: moduli.c,v 1.20 2007/02/24 03:30:11 ray Exp $ */ /* * Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> @@ -490,11 +490,9 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted) res = 0; lp = xmalloc(QLINESIZE + 1); - while (fgets(lp, QLINESIZE, in) != NULL) { - int ll = strlen(lp); - + while (fgets(lp, QLINESIZE + 1, in) != NULL) { count_in++; - if (ll < 14 || *lp == '!' || *lp == '#') { + if (strlen(lp) < 14 || *lp == '!' || *lp == '#') { debug2("%10u: comment or short line", count_in); continue; } |