Verify that where() clauses are well formed. Fixes #1865.

1 files changed, 6 insertions, 0 deletions

diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
index 0b9dbe28..54429ab1 100644
--- a/modules/kohana23_compat/libraries/MY_Database_Builder.php
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -25,6 +25,9 @@ class Database_Builder extends Database_Builder_Core {
   public function merge_where($tuples) {
     if ($tuples) {
       foreach ($tuples as $tuple) {
+        if (count($tuple) != 3) {
+          throw new Database_Exception("Column triplets require a column, op and value");
+        }
         $this->where($tuple[0], $tuple[1], $tuple[2]);
       }
     }
@@ -38,6 +41,9 @@ class Database_Builder extends Database_Builder_Core {
   public function merge_or_where($tuples) {
     if ($tuples) {
       foreach ($tuples as $tuple) {
+        if (count($tuple) != 3) {
+          throw new Database_Exception("Column triplets require a column, op and value");
+        }
         $this->or_where($tuple[0], $tuple[1], $tuple[2]);
       }
     }