* match.c (match_files): Bugfix. A (sub)query that runs out of data

lines to match must fail. Extra data lines relative to the spec
are tolerated; extra spec lines unmet by data aren't.

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ec76f4d..5b503fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-04  Kaz Kylheku  <kkylheku@gmail.com>
+
+	* match.c (match_files): Bugfix. A (sub)query that runs out of data
+	lines to match must fail. Extra data lines relative to the spec
+	are tolerated; extra spec lines unmet by data aren't.
+
 2010-10-03  Kaz Kylheku  <kkylheku@gmail.com>
 
 	* lib.h (lazy_string): Fix incorrect comment.
diff --git a/match.c b/match.c
index 32418442..27234fd0 100644
--- a/match.c
+++ b/match.c
@@ -1726,6 +1726,9 @@ repeat_spec_same_data:
         return nil;
 
       bindings = new_bindings;
+    } else {
+      debuglf(spec_linenum, lit("spec ran out of data"), nao);
+      return nil;
     }
   }