Adding early return when connection to MySQL or MySQLi fails.

Fixes #1732
cakephp · Jun 25, 2011 · 3189872 · 3189872
1 parent 41d2852
commit 3189872
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -564,6 +564,10 @@ function connect() {
 			$this->connection = mysql_pconnect($config['host'] . ':' . $config['port'], $config['login'], $config['password']);
 		}
 
+		if (!$this->connection) {
+			return false;
+		}
+
 		if (mysql_select_db($config['database'], $this->connection)) {
 			$this->connected = true;
 		}

diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -64,6 +64,8 @@ function connect() {
 
 		if ($this->connection !== false) {
 			$this->connected = true;
+		} else {
+			return false;
 		}
 
 		$this->_useAlias = (bool)version_compare(mysqli_get_server_info($this->connection), "4.1", ">=");