audiod: Fix some memory leaks in the com_stat() error paths.

[paraslash.git] / audiod_command.c

diff --git a/audiod_command.c b/audiod_command.c
index fe30b2476e6dd99738325df1fccb4c34d646d3b4..5bd511df7693a1c6713b2c95917791a1a72d2d39 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -166,7 +166,7 @@ int com_kill(int fd, int argc, char **argv)
        return ret;
 }
 
-int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
+int com_stat(int fd, int argc, char **argv)
 {
        int i, ret;
        char *buf = NULL;
@@ -187,10 +187,11 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
                int slot_num = get_play_time_slot_num();
                char *ts = get_time_string(slot_num);
                if (ts) {
+                       PARA_ERROR_LOG("play time: %s\n", ts);
                        ret = client_write(fd, ts);
+                       free(ts);
                        if (ret < 0)
                                goto out;
-                       free(ts);
                }
        }
        if (mask & (one << SI_AUDIOD_UPTIME)) {
@@ -199,23 +200,23 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
                        status_item_list[SI_AUDIOD_UPTIME], us);
                free(us);
                ret = client_write(fd, tmp);
+               free(tmp);
                if (ret < 0)
                        goto out;
-               free(tmp);
        }
        if (mask & (one << SI_AUDIOD_STATUS)) {
                char *s = audiod_status_string();
                ret = client_write(fd, s);
+               free(s);
                if (ret < 0)
                        goto out;
-               free(s);
        }
        if (mask & (one << SI_DECODER_FLAGS)) {
                char *df = decoder_flags();
                ret = client_write(fd, df);
+               free(df);
                if (ret < 0)
                        goto out;
-               free(df);
        }
        FOR_EACH_STATUS_ITEM(i) {
                char *tmp, *v;