diff options
| author | Nandaja Varma <nvarma@redhat.com> | 2015-02-03 13:17:04 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-04-30 08:48:11 -0700 |
| commit | 7d7b80efe8c745f3ff7de76fc31c4977098cae01 (patch) | |
| tree | a3a21a87b5e126dc4054c5675bd137548564d23c /xlators/features/changelog | |
| parent | 508eb854f3f94f52d4ebd050f3e45deb9cfa90c8 (diff) | |
changelog: Fixing buffer overrun coverity issues.
Coverity IDs:
1214630
1214631
1214633
1234643
Change-Id: I172c4f49bf651b2324522f9e661023f73ca05339
BUG: 789278
Signed-off-by: Nandaja Varma <nvarma@redhat.com>
Reviewed-on: http://review.gluster.org/9557
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Sakshi Bansal
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/features/changelog')
| -rw-r--r-- | xlators/features/changelog/src/changelog-helpers.c | 2 | ||||
| -rw-r--r-- | xlators/features/changelog/src/changelog-misc.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c index ca326043acc..aef847c037b 100644 --- a/xlators/features/changelog/src/changelog-helpers.c +++ b/xlators/features/changelog/src/changelog-helpers.c @@ -313,7 +313,7 @@ htime_update (xlator_t *this, ret = -1; goto out; } - strcpy (changelog_path, buffer); + strncpy (changelog_path, buffer, PATH_MAX); len = strlen (changelog_path); changelog_path[len] = '\0'; /* redundant */ diff --git a/xlators/features/changelog/src/changelog-misc.h b/xlators/features/changelog/src/changelog-misc.h index b45302ad099..196bd4c8195 100644 --- a/xlators/features/changelog/src/changelog-misc.h +++ b/xlators/features/changelog/src/changelog-misc.h @@ -82,14 +82,14 @@ } \ } while (0) -#define CHANGELOG_FILL_HTIME_DIR(changelog_dir, path) do { \ - strcpy (path, changelog_dir); \ - strcat (path, "/htime"); \ +#define CHANGELOG_FILL_HTIME_DIR(changelog_dir, path) do { \ + strncpy (path, changelog_dir, sizeof (path) - 1); \ + strcat (path, "/htime"); \ } while(0) -#define CHANGELOG_FILL_CSNAP_DIR(changelog_dir, path) do { \ - strcpy (path, changelog_dir); \ - strcat (path, "/csnap"); \ +#define CHANGELOG_FILL_CSNAP_DIR(changelog_dir, path) do { \ + strncpy (path, changelog_dir, sizeof (path) - 1); \ + strcat (path, "/csnap"); \ } while(0) /** * everything after 'CHANGELOG_TYPE_ENTRY' are internal types |