From 8afe182e0c4d7a9ad95aff46a5ac030cd7156c80 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Sun, 28 Oct 2012 11:31:25 +0100
Subject: [PATCH] Fix merge: Initialise data before accessing them.

---
 src/csync.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/csync.c b/src/csync.c
index bdb8d7cae..4a2334ae6 100644
--- a/src/csync.c
+++ b/src/csync.c
@@ -551,15 +551,15 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
     _csync_treewalk_context *twctx = NULL;
     TREE_WALK_FILE trav;
 
+    cur = (csync_file_stat_t *) obj;
+    ctx = (CSYNC *) data;
+
     if (!(ctx && obj && data)) {
       ctx->error_code = CSYNC_ERR_PARAM;
       return -1;
     }
     ctx->error_code = CSYNC_ERR_NONE;
 
-    cur = (csync_file_stat_t *) obj;
-    ctx = (CSYNC *) data;
-
     twctx = (_csync_treewalk_context*) ctx->userdata;
     if (twctx == NULL) {
       ctx->error_code = CSYNC_ERR_PARAM;