X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=382b0e9091c4cb3d6679f9779ad6faff9fb1fe15;hp=74d65fff6750355fd4a62b296e0b0d4d2d70ff2b;hb=33434de86d9f9c237b7bfb1204512404c42e83ff;hpb=3fd8d0567ae654aed7e97e832568d3e1b98e20a2

diff --git a/mp3_afh.c b/mp3_afh.c
index 74d65fff..382b0e90 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -300,6 +300,9 @@ static int replace_tags(struct id3_tag *id3_t, struct taginfo *tags)
 static void free_tag(struct id3_tag *id3_t)
 {
 	int i, j;
+
+	if (!id3_t)
+		return;
 	for (i = 0; i < id3_t->nframes; i++) {
 		struct id3_frame *fr = id3_t->frames[i];
 		for (j = 0; j < fr->nfields; j++) {
@@ -337,29 +340,27 @@ static int mp3_rewrite_tags(const char *map, size_t mapsize,
 	if (v2_tag) {
 		PARA_NOTICE_LOG("replacing id3v2 tag\n");
 		old_v2size = v2_tag->paddedsize;
-	} else if (!v1_tag) {
-		PARA_NOTICE_LOG("no id3 tags found, adding id3v2 tag\n");
+	} else {
+		PARA_NOTICE_LOG("adding id3v2 tag\n");
 		v2_tag = id3_tag_new();
 		assert(v2_tag);
 	}
-	if (v2_tag) {
-		/*
-		 * Turn off all options to avoid creating an extended header.
-		 * id321 does not understand it.
-		 */
-		id3_tag_options(v2_tag, ~0U, 0);
-		ret = replace_tags(v2_tag, tags);
-		if (ret < 0)
-			goto out;
-		new_v2size = id3_tag_render(v2_tag, NULL);
-		v2_buffer = para_malloc(new_v2size);
-		id3_tag_render(v2_tag, v2_buffer);
-		PARA_INFO_LOG("writing v2 tag (%lu bytes)\n", new_v2size);
-		ret = write_all(fd, (char *)v2_buffer, new_v2size);
-		free(v2_buffer);
-		if (ret < 0)
-			goto out;
-	}
+	/*
+	 * Turn off all options to avoid creating an extended header.  id321
+	 * does not understand it.
+	 */
+	id3_tag_options(v2_tag, ~0U, 0);
+	ret = replace_tags(v2_tag, tags);
+	if (ret < 0)
+		goto out;
+	new_v2size = id3_tag_render(v2_tag, NULL);
+	v2_buffer = para_malloc(new_v2size);
+	id3_tag_render(v2_tag, v2_buffer);
+	PARA_INFO_LOG("writing v2 tag (%lu bytes)\n", new_v2size);
+	ret = write_all(fd, (char *)v2_buffer, new_v2size);
+	free(v2_buffer);
+	if (ret < 0)
+		goto out;
 	data_sz = mapsize - old_v2size;
 	if (v1_tag && data_sz >= 128)
 		data_sz -= 128;
@@ -372,10 +373,8 @@ static int mp3_rewrite_tags(const char *map, size_t mapsize,
 		ret = write_all(fd, (char *)v1_buffer, 128);
 	}
 out:
-	if (v1_tag)
-		free_tag(v1_tag);
-	if (v2_tag)
-		free_tag(v2_tag);
+	free_tag(v1_tag);
+	free_tag(v2_tag);
 	return ret;
 }