X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=0544091bdba4e5054b120e24322504f56e38df4f;hb=9c9d3e49b2f17e5a83b44b009785b9b6dd5b95aa;hp=944d904dd14aaab70fa8689e8be82ac5f707fd62;hpb=3cdcb449fc23f0bebe34343dc26b4e34b82175d5;p=paraslash.git

diff --git a/aft.c b/aft.c
index 944d904d..0544091b 100644
--- a/aft.c
+++ b/aft.c
@@ -983,6 +983,17 @@ out:
 	WRITE_STATUS_ITEM(pb, SI_file_size, "%ld\n", statbuf.st_size / 1024);
 }
 
+/**
+ * Deallocate and invalidate the status item strings.
+ *
+ * This needs to be a public function so that afs.c can call it on shutdown.
+ */
+void free_status_items(void)
+{
+	freep(&status_items);
+	freep(&parser_friendly_status_items);
+}
+
 static int make_status_items(void)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
@@ -992,6 +1003,7 @@ static int make_status_items(void)
 	time_t current_time;
 	int ret;
 
+	free_status_items();
 	if (!status_item_ls_data.path) /* no audio file open */
 		return 0;
 	ret = lls_parse(ARRAY_SIZE(argv), argv, cmd, &opts.lpr, NULL);
@@ -1001,23 +1013,20 @@ static int make_status_items(void)
 	if (ret < 0)
 		goto out;
 	make_inode_status_items(&pb);
-	free(status_items);
 	status_items = pb.buf;
 
 	memset(&pb, 0, sizeof(pb));
 	pb.max_size = shm_get_shmmax() - 1;
 	pb.flags = PBF_SIZE_PREFIX;
 	ret = print_list_item(&status_item_ls_data, &opts, &pb, current_time);
-	if (ret < 0) {
-		free(status_items);
-		status_items = NULL;
-		return ret;
-	}
+	if (ret < 0)
+		goto out;
 	make_inode_status_items(&pb);
-	free(parser_friendly_status_items);
 	parser_friendly_status_items = pb.buf;
 	ret = 1;
 out:
+	if (ret < 0)
+		free_status_items();
 	lls_free_parse_result(opts.lpr, cmd);
 	return ret;
 }