fix segmentation fault in song info parser

The database parser does not check whether the song object has been initialized yet, which may lead to a NULL pointer dereference. Add this check. git-svn-id: https://svn.musicpd.org/mpd/trunk@7201 09075e82-0dd4-0310-85a5-a0d7c8717e4f

fix segmentation fault in song info parser
c5e1bc39 · Max Kellermann · Eric Wong · c9e6201d · c5e1bc39
Commit c5e1bc39 authored Mar 26, 2008 by Max Kellermann Committed by Eric Wong Mar 26, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

song.c src/song.c +5 -4

No files found.
--- a/src/song.c
+++ b/src/song.c
@@ -247,9 +247,11 @@ void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir)
 			song->url = xstrdup(buffer + strlen(SONG_KEY));
 			song->type = SONG_TYPE_FILE;
 			song->parentDir = parentDir;
+		} else if (*buffer == 0) {
+			/* ignore empty lines (starting with '\0') */
+		} else if (song == NULL) {
+			FATAL("Problems reading song info\n");
 		} else if (0 == strncmp(SONG_FILE, buffer, strlen(SONG_FILE))) {
-			if (!song)
-				FATAL("Problems reading song info\n");
 			/* we don't need this info anymore
 			   song->url = xstrdup(&(buffer[strlen(SONG_FILE)]));
 			 */
@@ -267,8 +269,7 @@ void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir)
 		} else if (0 == strncmp(SONG_MTIME, buffer, strlen(SONG_MTIME))) {
 			song->mtime = atoi(&(buffer[strlen(SONG_MTIME)]));
 		}
-		/* ignore empty lines (starting with '\0') */
-		else if (*buffer)
+		else
 			FATAL("songinfo: unknown line in db: %s\n", buffer);
 	}