From 7eca3d70c39d2b902f5bc28d16bfd7b017596be3 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 5 Aug 2012 13:50:45 +0200
Subject: [PATCH] Fix some issues reported by cppcheck

---
 citadel/citserver.c                    | 2 +-
 citadel/ecrash.c                       | 1 +
 citadel/modules/network/serv_network.c | 5 ++++-
 citadel/utils/ctdlmigrate.c            | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 7e5538b51..e60693859 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -425,7 +425,7 @@ int is_public_client(void)
 					}
 				}
 			}
-		fclose(fp);
+		if (fp != NULL) fclose(fp);
 		pc_timestamp = time(NULL);
 		end_critical_section(S_PUBLIC_CLIENTS);
 	}
diff --git a/citadel/ecrash.c b/citadel/ecrash.c
index b9decd1bf..ec91a02e4 100644
--- a/citadel/ecrash.c
+++ b/citadel/ecrash.c
@@ -393,6 +393,7 @@ int eCrash_Init(eCrashParameters *params)
 
 	DPRINTF(ECRASH_DEBUG_VERY_VERBOSE,"Init Starting params = %p\n", params);
 
+	if (params == NULL) return -1;
 	// Allocate our backtrace area
 	gbl_backtraceBuffer = malloc(sizeof(void *) * (params->maxStackDepth+5));
 
diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 5dbb75f15..9c6fb5a7b 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -259,7 +259,10 @@ int network_sync_to(char *target_node, long len)
 	fclose(fp);
 	end_critical_section(S_NETCONFIGS);
 
-	if (!found_node) return(-1);
+	if (!found_node) {
+		free(sc.ignet_push_shares);
+		return(-1);
+	}
 
 	sc.working_ignetcfg = load_ignetcfg();
 	sc.the_netmap = read_network_map();
diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 6a5017615..5a5d0c474 100644
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -55,7 +55,7 @@
 void getz(char *buf) {
 	char *ptr;
 
-	ptr = fgets(buf, 32767, stdin);
+	ptr = fgets(buf, SIZ, stdin);
 	if (!ptr) {
 		buf[0] = 0;
 		return;
@@ -81,8 +81,8 @@ int main(int argc, char *argv[])
 	char cmd[PATH_MAX];
 	char buf[PATH_MAX];
 	char socket_path[PATH_MAX];
-	char remote_user[256];
-	char remote_host[256];
+	char remote_user[SIZ];
+	char remote_host[SIZ];
 	char remote_sendcommand[PATH_MAX];
 	FILE *sourcefp = NULL;
 	FILE *targetfp = NULL;
-- 
2.30.2