diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-10-05 20:13:50 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-10-05 20:13:50 -0700 |
| commit | c344fa6a506d117f1e4c9a6213c5c94937631ff9 (patch) | |
| tree | 682afaf535c247c6992645694e8749a1a7aa8f60 /src/song.c | |
| parent | 8a2306146149d4d7915ed1346a7dbd908fb1048f (diff) | |
| download | mpd-c344fa6a506d117f1e4c9a6213c5c94937631ff9.tar.gz mpd-c344fa6a506d117f1e4c9a6213c5c94937631ff9.tar.xz mpd-c344fa6a506d117f1e4c9a6213c5c94937631ff9.zip | |
Assert if we don't have song or song->url set
song objects cannot exist without a path or URL
Diffstat (limited to 'src/song.c')
| -rw-r--r-- | src/song.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/song.c b/src/song.c index ab98963ad..27f48ad03 100644 --- a/src/song.c +++ b/src/song.c @@ -31,8 +31,13 @@ static Song * song_alloc(const char *url, Directory *parent) { - size_t urllen = strlen(url); - Song *song = xmalloc(sizeof(Song) + urllen); + size_t urllen; + Song *song; + + assert(url); + urllen = strlen(url); + assert(urllen); + song = xmalloc(sizeof(Song) + urllen); song->tag = NULL; memcpy(song->url, url, urllen + 1); @@ -44,6 +49,7 @@ static Song * song_alloc(const char *url, Directory *parent) Song *newSong(const char *url, Directory * parentDir) { Song *song; + assert(*url); if (strchr(url, '\n')) { DEBUG("newSong: '%s' is not a valid uri\n", url); |