Merge pull request #162 from Quy/1041-innodb

#1041 Check that the result is a valid resource in innodb
fluxbb · Nov 2, 2015 · 6f2e3d6 · 6f2e3d6
2 parents fbbb8e4 + 93da8c2
commit 6f2e3d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/dblayer/mysql_innodb.php b/include/dblayer/mysql_innodb.php
@@ -195,7 +195,7 @@ function close()
 	{
 		if ($this->link_id)
 		{
-			if ($this->query_result)
+			if (is_resource($this->query_result))
 				@mysql_free_result($this->query_result);
 
 			return @mysql_close($this->link_id);

diff --git a/include/dblayer/mysqli_innodb.php b/include/dblayer/mysqli_innodb.php
@@ -201,7 +201,7 @@ function close()
 	{
 		if ($this->link_id)
 		{
-			if ($this->query_result)
+			if ($this->query_result instanceof mysqli_result)
 				@mysqli_free_result($this->query_result);
 
 			return @mysqli_close($this->link_id);