database: fixed NULL pointer dereference after charset change

When the filesystem_charset is changed in mpd.conf, MPD should discard the old database. In this error branch, MPD did not fill the GError object properly, and logged a warning message instead, which caused a segmentation fault.

database: fixed NULL pointer dereference after charset change
15d4c841 · Max Kellermann · 5b9dfbe3 · 15d4c841 · 15d4c841
Commit 15d4c841 authored Jun 30, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

NEWS NEWS +1 -0

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

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.15.1 (2009/??/??)
 * commands:
  - don't resume playback when stopping during pause
+* database: fixed NULL pointer dereference after charset change


 ver 0.15 (2009/06/23)

--- a/src/database.c
+++ b/src/database.c
@@ -318,10 +318,11 @@ db_load(GError **error)
 			if (old_charset != NULL
 			    && strcmp(new_charset, old_charset)) {
 				fclose(fp);
-				g_message("Existing database has charset \"%s\" "
-					  "instead of \"%s\"; "
-					  "discarding database file",
-					  new_charset, old_charset);
+				g_set_error(error, db_quark(), 0,
+					    "Existing database has charset "
+					    "\"%s\" instead of \"%s\"; "
+					    "discarding database file",
+					    new_charset, old_charset);
 				return false;
 			}
 		} else {