oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

song: don't allow calling song_get_url(NULL)

Browse Source 
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.
This commit is contained in:
Max Kellermann
2008-10-08 11:06:37 +02:00
parent 4ab6b59aaf
commit e1a4474ad4
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/decoder_thread.c
View File

@@ -37,10 +37,7 @@ static void decodeStart(void)
char path_max_fs[MPD_PATH_MAX]; char path_max_fs[MPD_PATH_MAX];
char path_max_utf8[MPD_PATH_MAX]; char path_max_utf8[MPD_PATH_MAX];
if (!song_get_url(dc.next_song, path_max_utf8)) { song_get_url(dc.next_song, path_max_utf8);
dc.error = DECODE_ERROR_FILE;
goto stop_no_close;
}
if (!isRemoteUrl(path_max_utf8)) { if (!isRemoteUrl(path_max_utf8)) {
rmp2amp_r(path_max_fs, rmp2amp_r(path_max_fs,
utf8_to_fs_charset(path_max_fs, path_max_utf8)); utf8_to_fs_charset(path_max_fs, path_max_utf8));

4
src/song.c
View File

@@ -121,9 +121,7 @@ song_file_update(struct song *song)
char * char *
song_get_url(struct song *song, char *path_max_tmp) song_get_url(struct song *song, char *path_max_tmp)
{ {
if (!song) assert(song != NULL);
return NULL;
assert(*song->url); assert(*song->url);
if (!song->parent || !song->parent->path) if (!song->parent || !song->parent->path)