song: don't allow calling song_get_url(NULL)

The runtime check suggests that the author has somehow thought song_get_url(NULL) might be valid. It should not be. Replace it with an assertion.

song: don't allow calling song_get_url(NULL)
e1a4474a · Max Kellermann · 4ab6b59a · e1a4474a · e1a4474a
Commit e1a4474a authored Oct 08, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

decoder_thread.c src/decoder_thread.c +1 -4

song.c src/song.c +1 -3

No files found.
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -37,10 +37,7 @@ static void decodeStart(void)
 	char path_max_fs[MPD_PATH_MAX];
 	char path_max_utf8[MPD_PATH_MAX];

-	if (!song_get_url(dc.next_song, path_max_utf8)) {
-		dc.error = DECODE_ERROR_FILE;
-		goto stop_no_close;
-	}
+	song_get_url(dc.next_song, path_max_utf8);
 	if (!isRemoteUrl(path_max_utf8)) {
 		rmp2amp_r(path_max_fs,
 		          utf8_to_fs_charset(path_max_fs, path_max_utf8));

--- a/src/song.c
+++ b/src/song.c
@@ -121,9 +121,7 @@ song_file_update(struct song *song)
 char *
 song_get_url(struct song *song, char *path_max_tmp)
 {
-	if (!song)
-		return NULL;
-
+	assert(song != NULL);
 	assert(*song->url);

 	if (!song->parent || !song->parent->path)