Merge branch 'd-minor' into 'master'

Prevent some potential null-pointer deferences.

See merge request !9

src/fe-common/core/fe-channels.c

@@ -453,7 +453,7 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 		}
 	}
 
-	if (str->len > strlen(prefix_format)) {
+	if (prefix_format != NULL && str->len > strlen(prefix_format)) {
 		printtext(channel->server, channel->visible_name,
 		          MSGLEVEL_CLIENTCRAP, "%s", str->str);
 	}

src/fe-common/irc/fe-netsplit.c

@@ -148,6 +148,8 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, con
 	char *sourceserver;
 	GSList *tmp;
 
+	g_return_if_fail(rec->servers != NULL);
+
 	destservers = g_string_new(NULL);
 	for (tmp = rec->servers; tmp != NULL; tmp = tmp->next) {
 		NETSPLIT_SERVER_REC *rec = tmp->data;

src/fe-text/mainwindows-layout.c

@@ -121,6 +121,8 @@ static void sig_layout_restore(void)
 	if (node == NULL) return;
 
 	sorted_config = get_sorted_windows_config(node);
+	if (sorted_config == NULL) return;
+
         windows_count = g_slist_length(sorted_config);
 
         /* calculate the saved terminal height */