* lib.c (numberp): Fix bad type check: null pointer dereference when

object is nil.

* match.c (do_match_line): Bugfix for incorrect treatment of long
lines. Must return the absolute position from the start of the original
line (plus(c->pos, c->base)), rather than just c->pos, which only
measures from the start of a line that may have been chopped by
consume_prefix.

1 files changed, 2 insertions, 2 deletions

diff --git a/match.c b/match.c
index bf6b82a6..3fb64b0b 100644
--- a/match.c
+++ b/match.c
@@ -1198,7 +1198,7 @@ static val do_match_line(match_line_ctx *c)
     c->specline = cdr(c->specline);
   }
 
-  debug_return (cons(c->bindings, c->pos));
+  debug_return (cons(c->bindings, plus(c->pos, c->base)));
   debug_leave;
 }
 
@@ -3510,7 +3510,7 @@ repeat_spec_same_data:
                  match_line(ml_all(c.bindings, specline, dataline, zero,
                                    c.data_lineno, first(c.files))));
 
-      if (fixnump(success) && c_num(success) < c_num(length_str(dataline))) {
+      if (numberp(success) && length_str_gt(dataline, success)) {
         debuglf(specline, lit("spec only matches line to position ~a: ~a"),
                 success, dataline, nao);
         debug_return (nil);