From 17827defd6703298b68fee8fd08aef69ab0e2866 Mon Sep 17 00:00:00 2001 From: Nandaja Varma Date: Mon, 9 Feb 2015 17:39:20 +0530 Subject: snapview: Fixing the coverity issues Coverity CIDs: 1228601 1220056 1238185 1257624 Change-Id: Idb4cc3b44bc3ccb8b497ce355e1e3bacfb176db9 BUG: 789278 Signed-off-by: Nandaja Varma Reviewed-on: http://review.gluster.org/9615 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/features/snapview-server/src/snapview-server-mgmt.c | 2 +- xlators/features/snapview-server/src/snapview-server.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'xlators/features/snapview-server/src') diff --git a/xlators/features/snapview-server/src/snapview-server-mgmt.c b/xlators/features/snapview-server/src/snapview-server-mgmt.c index a4ce89cd47c..0fe3687e204 100644 --- a/xlators/features/snapview-server/src/snapview-server-mgmt.c +++ b/xlators/features/snapview-server/src/snapview-server-mgmt.c @@ -468,7 +468,7 @@ out: } GF_FREE (req.dict.dict_val); - if (frame_cleanup) { + if (frame_cleanup && frame) { /* * Destroy the frame if we encountered an error * Else we need to clean it up in diff --git a/xlators/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c index 4820181cb56..035dd54d1f9 100644 --- a/xlators/features/snapview-server/src/snapview-server.c +++ b/xlators/features/snapview-server/src/snapview-server.c @@ -478,7 +478,6 @@ svs_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) int32_t ret = -1; svs_private_t *private = NULL; inode_t *parent = NULL; - glfs_t *fs = NULL; snap_dirent_t *dirent = NULL; gf_boolean_t entry_point_key = _gf_false; gf_boolean_t entry_point = _gf_false; @@ -525,7 +524,7 @@ svs_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) dirent = svs_get_latest_snap_entry (this); if (dirent && !dirent->fs) { - fs = svs_initialise_snapshot_volume (this, dirent->name, NULL); + svs_initialise_snapshot_volume (this, dirent->name, NULL); } if (xdata && !inode_ctx) { @@ -734,7 +733,7 @@ svs_add_xattrs_to_dict (xlator_t *this, dict_t *dict, char *list, ssize_t size) remaining_size = size; list_offset = 0; while (remaining_size > 0) { - strcpy (keybuffer, list + list_offset); + strncpy (keybuffer, list + list_offset, sizeof (keybuffer) - 1); #ifdef GF_DARWIN_HOST_OS /* The protocol expect namespace for now */ char *newkey = NULL; -- cgit