diff options
| author | Sakshi <sabansal@redhat.com> | 2015-04-15 13:28:24 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-04-14 05:55:50 -0700 |
| commit | d5409aae63a7ac5e5b3ea6cfa16c6250a028291c (patch) | |
| tree | 9da5485f7ef56dd7adca9d7dddf2cbcdf4827cb9 /libglusterfs/src/options.c | |
| parent | 1c9c776352c60deeda51be66fda6d44bf06d3796 (diff) | |
libglusterfs: coverity fix
fix missing varargs cleanup
CID 1124856: string overflow
CID 1124656: NULL return
CID 1124374: constant expression
Change-Id: Iead530c599bdfef05a40c68b892215f4e4f02247
BUG: 789278
Signed-off-by: Sakshi Bansal <sabansal@redhat.com>
Reviewed-on: http://review.gluster.org/9630
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'libglusterfs/src/options.c')
| -rw-r--r-- | libglusterfs/src/options.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c index c8f2585ae2b..53bd779861c 100644 --- a/libglusterfs/src/options.c +++ b/libglusterfs/src/options.c @@ -248,19 +248,20 @@ void set_error_str (char *errstr, size_t len, volume_option_t *opt, const char *key, const char *value) { - int i = 0; - char given_array[4096] = {0,}; + int i = 0; + int ret = 0; + + ret = snprintf (errstr, len, "option %s %s: '%s' is not valid " + "(possible options are ", key, value, value); for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) && opt->value[i];) { - strcat (given_array, opt->value[i]); + ret += snprintf (errstr + ret, len - ret, "%s", opt->value[i]); if (((++i) < ZR_OPTION_MAX_ARRAY_SIZE) && (opt->value[i])) - strcat (given_array, ", "); + ret += snprintf (errstr + ret, len - ret, ", "); else - strcat (given_array, "."); + ret += snprintf (errstr + ret, len - ret, ".)"); } - snprintf (errstr, len, "option %s %s: '%s' is not valid " - "(possible options are %s)", key, value, value, given_array); return; } @@ -332,6 +333,7 @@ xlator_option_validate_str (xlator_t *xl, const char *key, const char *value, out: if (ret) { set_error_str (errstr, sizeof (errstr), opt, key, value); + gf_msg (xl->name, GF_LOG_ERROR, 0, LG_MSG_INVALID_ENTRY, "%s", errstr); if (op_errstr) |