diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2019-02-27 13:13:29 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2019-02-27 13:13:29 +0100 |
| commit | 93ccffcb407836b100df2a45a204ccabd872ff3e (patch) | |
| tree | 9a0b3aacc51d60550e6d1aa5f380247aedd7ef09 | |
| parent | e13b1445e76a366c90766ee5111b922f3c2bde9c (diff) | |
CWE-126 workaround
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | src/options.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/options.c b/src/options.c index 66c44a6..ad43380 100644 --- a/src/options.c +++ b/src/options.c @@ -242,7 +242,7 @@ static struct option long_options[] = { static const void *get_default_optval(enum option_type opttype, const char *optname) { for (unsigned i = 0; i < ARRAY_SIZE(long_options); ++i) { - if (strncmp(long_options[i].name, optname, strlen(long_options[i].name)) == 0) { + if (strncmp(long_options[i].name, optname, BUFSIZ /* not optimal */) == 0) { assert(usage[i].otype == opttype); return &usage[i].str; } @@ -307,9 +307,9 @@ static void print_multiline(const char *prefix, const char *multiline) { do { if (start) { end = strstr(start, sep); - if (end) { + if (end && *end != '\0') { printf("%s%.*s\n", prefix, (int)(end-start), start); - start = end + strlen(sep); + start = end + strnlen(sep, BUFSIZ /* not optimal */); } } } while (start && end); @@ -495,10 +495,10 @@ int parse_options(int argc, char **argv) { pt_log(kLog_debug, "Password set - unauthenicated connections will be refused.\n"); // Compute the password digest md5_init(&state); - md5_append(&state, (md5_byte_t*)optarg, strlen(opts.password)); + md5_append(&state, (md5_byte_t*)optarg, strnlen(opts.password, BUFSIZ /* not optimal */)); md5_finish(&state, &opts.password_digest[0]); // Hide the password in process listing - memset(optarg, '*', strlen(optarg)); + memset(optarg, '*', strnlen(optarg, BUFSIZ /* not optimal */)); break; #ifndef WIN32 case 'd': |