aft.c: Fix a possible memory leak.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index e485997e273bbf4f656a582a695e6344043ea930..9fca561cdd5919e011e07673a54e8a4f00f21003 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -733,9 +733,9 @@ int open_and_update_audio_file(struct osl_row *aft_row,
        aced.old_afsi = &old_afsi;
        afs_event(AFSI_CHANGE, NULL, &aced);
        ret = save_afd(afd);
+       free(afd->afhi.chunk_table);
        if (ret < 0)
                goto err;
-       free(afd->afhi.chunk_table);
 err:
        osl_close_disk_object(&chunk_table_obj);
        return ret;
@@ -810,8 +810,9 @@ static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
        get_attribute_text(&afsi->attributes, " ", &att_text);
        if (!att_text)
                return para_strdup(att_bitmap);
-       att_lines = make_message("attributes: %s\nattributes_txt: %s",
-               att_bitmap, att_text);
+       att_lines = make_message("%s: %s\n%s: %s",
+               status_item_list[SI_ATTRIBUTES_BITMAP], att_bitmap,
+               status_item_list[SI_ATTRIBUTES_TXT], att_text);
        free(att_text);
        return att_lines;
 }
@@ -924,9 +925,9 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        "hash: %s\n"
                        "%s" /* image id, image name */
                        "%s" /* lyrics */
-                       "bitrate: %dkbit/s\n"
+                       "%s: %dkbit/s\n" /* bitrate */
                        "format: %s\n"
-                       "frequency: %dHz\n"
+                       "%s: %dHz\n" /* frequency */
                        "channels: %d\n"
                        "duration: %s\n"
                        "seconds_total: %lu\n"
@@ -940,9 +941,9 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        asc_hash,
                        image_lines,
                        lyrics_lines,
-                       afhi->bitrate,
+                       status_item_list[SI_BITRATE], afhi->bitrate,
                        audio_format_name(afsi->audio_format_id),
-                       afhi->frequency,
+                       status_item_list[SI_FREQUENCY], afhi->frequency,
                        afhi->channels,
                        duration_buf,
                        afhi->seconds_total,