summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr/src
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-07-02 04:55:28 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-07-02 05:17:03 -0700
commit2f15ffd6b5beef9abd501c594bc3cb38c2683f77 (patch)
tree107176560e1a97c42f3535380ef49d4dee3b0cd6 /xlators/cluster/afr/src
parent3dc79ca8e6119f5ff61058cc87f9a4fc251017ef (diff)
NULL dereference fixes in code base after running with 'clang'
* 212 logical (NULL deref/divide by zero) errors reduced to 28 (27 of them in contrib/ and lex part of codebase, 1 is invalid) * 11 API errors reduced to 0 Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 966 (NULL check for avoiding NULL dereferencing of pointers..) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=966
Diffstat (limited to 'xlators/cluster/afr/src')
-rw-r--r--xlators/cluster/afr/src/afr-inode-read.c2
-rw-r--r--xlators/cluster/afr/src/afr.c8
-rw-r--r--xlators/cluster/afr/src/afr.h32
3 files changed, 22 insertions, 20 deletions
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c
index b1bbac10bc2..ef72fb19779 100644
--- a/xlators/cluster/afr/src/afr-inode-read.c
+++ b/xlators/cluster/afr/src/afr-inode-read.c
@@ -802,7 +802,7 @@ afr_readv_cbk (call_frame_t *frame, void *cookie,
out:
if (unwind) {
- if (buf)
+ if (buf && local)
buf->ia_ino = local->cont.readv.ino;
AFR_STACK_UNWIND (readv, frame, op_ret, op_errno,
diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c
index 718384717e4..4ae128bbb55 100644
--- a/xlators/cluster/afr/src/afr.c
+++ b/xlators/cluster/afr/src/afr.c
@@ -2744,7 +2744,7 @@ init (xlator_t *this)
int32_t background_count = 0;
int32_t lock_server_count = 1;
- int32_t window_size;
+ int32_t window_size = 0;
int fav_ret = -1;
int read_ret = -1;
@@ -2780,8 +2780,8 @@ init (xlator_t *this)
&background_count);
if (dict_ret == 0) {
gf_log (this->name, GF_LOG_DEBUG,
- "Setting background self-heal count to %d.",
- window_size);
+ "Setting background self-heal count to %d",
+ background_count);
priv->background_self_heal_count = background_count;
}
@@ -2819,7 +2819,7 @@ init (xlator_t *this)
&window_size);
if (dict_ret == 0) {
gf_log (this->name, GF_LOG_DEBUG,
- "Setting data self-heal window size to %d.",
+ "Setting data self-heal window size to %d",
window_size);
priv->data_self_heal_window_size = window_size;
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h
index b223a9de3c0..4580bcda278 100644
--- a/xlators/cluster/afr/src/afr.h
+++ b/xlators/cluster/afr/src/afr.h
@@ -558,15 +558,15 @@ typedef struct {
/* try alloc and if it fails, goto label */
-#define ALLOC_OR_GOTO(var, type, label) do { \
- var = GF_CALLOC (sizeof (type), 1, \
- gf_afr_mt_##type); \
- if (!var) { \
- gf_log (this->name, GF_LOG_ERROR, \
- "out of memory :("); \
- op_errno = ENOMEM; \
- goto label; \
- } \
+#define ALLOC_OR_GOTO(var, type, label) do { \
+ var = GF_CALLOC (sizeof (type), 1, \
+ gf_afr_mt_##type); \
+ if (!var) { \
+ gf_log (this->name, GF_LOG_ERROR, \
+ "out of memory :("); \
+ op_errno = ENOMEM; \
+ goto label; \
+ } \
} while (0);
@@ -639,13 +639,15 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd);
do { \
afr_local_t *__local = NULL; \
xlator_t *__this = NULL; \
- __local = frame->local; \
- __this = frame->this; \
- frame->local = NULL; \
+ if (frame) { \
+ __local = frame->local; \
+ __this = frame->this; \
+ frame->local = NULL; \
+ } \
STACK_UNWIND_STRICT (fop, frame, params); \
- afr_local_cleanup (__local, __this); \
+ afr_local_cleanup (__local, __this); \
GF_FREE (__local); \
-} while (0);
+ } while (0);
#define AFR_STACK_DESTROY(frame) \
do { \
@@ -657,7 +659,7 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd);
STACK_DESTROY (frame->root); \
afr_local_cleanup (__local, __this); \
GF_FREE (__local); \
-} while (0);
+ } while (0);
/* allocate and return a string that is the basename of argument */
static inline char *