aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-17 22:13:39 +0100
committerMax Kellermann <max@duempel.org>2014-02-17 22:13:53 +0100
commitff62b6742ba989dd06faa135650371900b327e93 (patch)
tree6d75ee28da7d68c8d141eb56f2559266ef3a0a0c /src
parent6da0af94dff6bd3fb79ece582fc0a82ca51753f3 (diff)
downloadmpd-ff62b6742ba989dd06faa135650371900b327e93.tar.gz
mpd-ff62b6742ba989dd06faa135650371900b327e93.tar.xz
mpd-ff62b6742ba989dd06faa135650371900b327e93.zip
Main: check if database exists before attempting to close it
Fixes nullptr dereference.
Diffstat (limited to 'src')
-rw-r--r--src/Main.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index 267979f31..ef5f46ee8 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -595,8 +595,11 @@ int mpd_main(int argc, char *argv[])
#ifdef ENABLE_DATABASE
delete instance->update;
- instance->database->Close();
- delete instance->database;
+
+ if (instance->database != nullptr) {
+ instance->database->Close();
+ delete instance->database;
+ }
#endif
#ifdef ENABLE_SQLITE