Fixing a bug in the SQLite layer (and MySQLi, though it wasnt causing…

… a problem there for some reason) that caused ->result() to not return false even when it fails.
fluxbb · Jun 25, 2010 · af8ff9a · af8ff9a
1 parent 5840d8e
commit af8ff9a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/include/dblayer/mysqli.php b/include/dblayer/mysqli.php
@@ -94,10 +94,13 @@ function result($query_id = 0, $row = 0, $col = 0)
 	{
 		if ($query_id)
 		{
-			if ($row)
-				@mysqli_data_seek($query_id, $row);
+			if ($row !== 0 && @mysqli_data_seek($query_id, $row) === false)
+				return false;
 
 			$cur_row = @mysqli_fetch_row($query_id);
+			if ($cur_row === false)
+				return false;
+
 			return $cur_row[$col];
 		}
 		else

diff --git a/include/dblayer/mysqli_innodb.php b/include/dblayer/mysqli_innodb.php
@@ -107,10 +107,13 @@ function result($query_id = 0, $row = 0, $col = 0)
 	{
 		if ($query_id)
 		{
-			if ($row)
-				@mysqli_data_seek($query_id, $row);
+			if ($row !== 0 && @mysqli_data_seek($query_id, $row) === false)
+				return false;
 
 			$cur_row = @mysqli_fetch_row($query_id);
+			if ($cur_row === false)
+				return false;
+
 			return $cur_row[$col];
 		}
 		else

diff --git a/include/dblayer/sqlite.php b/include/dblayer/sqlite.php
@@ -127,10 +127,13 @@ function result($query_id = 0, $row = 0, $col = 0)
 	{
 		if ($query_id)
 		{
-			if ($row != 0)
-				@sqlite_seek($query_id, $row);
+			if ($row !== 0 && @sqlite_seek($query_id, $row) === false)
+				return false;
 
 			$cur_row = @sqlite_current($query_id);
+			if ($cur_row === false)
+				return false;
+
 			return $cur_row[$col];
 		}
 		else