db/proxy: check connect error before initializing SocketMonitor

Fixes crash bug because mpd_connection_get_async() was called without a connection.

db/proxy: check connect error before initializing SocketMonitor
f2f1801c · Max Kellermann · 9da57e74 · f2f1801c
Commit f2f1801c authored Mar 06, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

ProxyDatabasePlugin.cxx src/db/plugins/ProxyDatabasePlugin.cxx +7 -7

No files found.
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -353,19 +353,19 @@ ProxyDatabase::Connect(Error &error)
 		return false;
 	}

+	if (!CheckError(connection, error)) {
+		mpd_connection_free(connection);
+		connection = nullptr;
+
+		return false;
+	}
+
 	idle_received = unsigned(-1);
 	is_idle = false;

 	SocketMonitor::Open(mpd_async_get_fd(mpd_connection_get_async(connection)));
 	IdleMonitor::Schedule();

-	if (!CheckError(connection, error)) {
-		if (connection != nullptr)
-			Disconnect();
-
-		return false;
-	}
-
 	return true;
 }