diff options
author | Yaniv Kaul <ykaul@redhat.com> | 2018-08-21 20:43:07 +0300 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-08-31 13:13:43 +0000 |
commit | 052849983e51a061d7fb2c3ffd74fa78bb257084 (patch) | |
tree | 5f82954bd3518c7eeab6ece16edbf72b0a3e0db1 /xlators/features/marker/src/marker-quota-helper.c | |
parent | 67cfacaa9d5ce31240a4d39e81b2984a57ac8865 (diff) |
Various files: strncpy()->sprintf(), reduce strlen()'s
strncpy may not be very efficient for short strings copied into
a large buffer: If the length of src is less than n,
strncpy() writes additional null bytes to dest to ensure
that a total of n bytes are written.
Instead, use snprintf(). Check for truncated output
where applicable.
Also:
- save the result of strlen() and re-use it when possible.
- move from strlen to SLEN (sizeof() ) for const strings.
Compile-tested only!
Change-Id: I54e80d4f4a80e98d3775e376efe05c51af0b29eb
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/features/marker/src/marker-quota-helper.c')
-rw-r--r-- | xlators/features/marker/src/marker-quota-helper.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xlators/features/marker/src/marker-quota-helper.c b/xlators/features/marker/src/marker-quota-helper.c index e3e218f8af5..92d4094e7f8 100644 --- a/xlators/features/marker/src/marker-quota-helper.c +++ b/xlators/features/marker/src/marker-quota-helper.c @@ -297,7 +297,11 @@ mq_dict_set_contribution (xlator_t *this, dict_t *dict, loc_t *loc, goto out; if (contri_key) - strncpy (contri_key, key, QUOTA_KEY_MAX); + if (snprintf(contri_key, QUOTA_KEY_MAX, "%s", key) + >= QUOTA_KEY_MAX) { + ret = -1; + goto out; + } out: if (ret < 0) |