player: fix race condition during tag update

When a tag is updated, the old tag was freed before the new one was created. Reverse the order to be sure that other threads always see a valid pointer. This still leaves a possible race condition, but it will be addressed later.

player: fix race condition during tag update
1bfa6a94 · Max Kellermann · acf0d141 · 1bfa6a94
Commit 1bfa6a94 authored Nov 11, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

player_thread.c src/player_thread.c +4 -2

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -225,11 +225,13 @@ play_chunk(struct song *song, struct music_chunk *chunk,

 		if (!song_is_file(song)) {
 			/* always update the tag of remote streams */
+			struct tag *old_tag = song->tag;

-			if (song->tag != NULL)
-				tag_free(song->tag);
 			song->tag = tag_dup(chunk->tag);

+			if (old_tag != NULL)
+				tag_free(old_tag);
+
 			/* notify all clients that the tag of the
 			   current song has changed */
 			idle_add(IDLE_PLAYER);