[notcurses][input] handle non-matches in escape trie properly

dankamongmen/notcurses@dadd5d3

Author: tstack

src/third-party/notcurses/src/lib/automaton.c

@@ -556,6 +556,9 @@ int walk_automaton(automaton* a, struct inputctx* ictx, unsigned candidate,
     a->state = a->escapes;
     return 0;
   }
+  if(e == NULL){ // we're not in the trie
+    return -1;
+  }
   if(e->ntype == NODE_STRING){
     if(candidate == 0x1b || candidate == 0x07){
       a->state = e->trie[candidate];
@@ -570,6 +573,7 @@ int walk_automaton(automaton* a, struct inputctx* ictx, unsigned candidate,
     }
     return 0;
   }
+  assert(e->trie);
   if((a->state = e->trie[candidate]) == 0){
     if(esctrie_idx(a, e) == a->escapes){
       memset(ni, 0, sizeof(*ni));

src/third-party/notcurses/src/lib/in.c

@@ -2309,13 +2309,14 @@ process_escape(inputctx* ictx, const unsigned char* buf, int buflen){
       ncinput ni = {0};
       logdebug("walk_auto %u (%c)", candidate, isprint(candidate) ? candidate : ' ');
       int w = walk_automaton(&ictx->amata, ictx, candidate, &ni);
-      logdebug("walk result on %u (%c): %d %u", candidate,
+      logdebug("walk result on 0x%02x (%c): %d %u", candidate,
                isprint(candidate) ? candidate : ' ', w, ictx->amata.state);
       if(w > 0){
         if(ni.id){
           load_ncinput(ictx, &ni);
         }
         ictx->amata.used = 0;
+        ictx->amata.state = 0;
         return used;
       }else if(w < 0){
         // all inspected characters are invalid; return full negative "used"
@@ -2338,7 +2339,7 @@ process_escape(inputctx* ictx, const unsigned char* buf, int buflen){
 static void
 process_escapes(inputctx* ictx, unsigned char* buf, int* bufused){
   int offset = 0;
-  while(*bufused){
+  while(*bufused > 0){
     int consumed = process_escape(ictx, buf + offset, *bufused);
     // negative |consumed| means either that we're not sure whether it's an
     // escape, or it definitely is not.
@@ -2370,7 +2371,7 @@ process_escapes(inputctx* ictx, unsigned char* buf, int* bufused){
   }
   // move any leftovers to the front; only happens if we fill output queue,
   // or ran out of input data mid-escape
-  if(*bufused){
+  if(*bufused > 0){
     ictx->amata.matchstart = buf;
     memmove(buf, buf + offset, *bufused);
   }
@@ -2449,7 +2450,7 @@ process_bulk(inputctx* ictx, unsigned char* buf, int* bufused){
     offset += consumed;
   }
   // move any leftovers to the front
-  if(*bufused){
+  if(*bufused > 0){
     memmove(buf, buf + offset, *bufused);
   }
 }

test/expected/test_cmds.sh_a00943ef715598c7554b85de8502454e41bb9e28.out

@@ -1,4 +1,4 @@
- Thu Nov 03 09:20:00 2005          1 normal         2 errors         0 warnings         0 marks
- Thu Nov 03 09:45:00 2005          1 normal         0 errors         0 warnings         0 marks
- Fri Feb 03 09:20:00 2006          0 normal         1 errors         0 warnings         0 marks
- Wed Jan 03 09:20:00 2007          1 normal         0 errors         0 warnings         0 marks
+ Thu Nov 03 09:20:00 2005          1 normal         2 errors         0 warnings         0 marks
+ Thu Nov 03 09:45:00 2005          1 normal         0 errors         0 warnings         0 marks
+ Fri Feb 03 09:20:00 2006          0 normal         1 errors         0 warnings         0 marks
+ Wed Jan 03 09:20:00 2007          1 normal         0 errors         0 warnings         0 marks

test/expected/test_cmds.sh_af0fcbd30b3fd0d13477aa3325ef0302052a4d9f.out

@@ -1 +1 @@
- Sat Nov 03 08:00:00 2007          1 normal         0 errors         0 warnings         0 marks
+ Sat Nov 03 08:00:00 2007          1 normal         0 errors         0 warnings         0 marks

test/expected/test_cmds.sh_c7fabc25374ff47c47931f63b1d697061b816a28.out

@@ -1,2 +1,2 @@
- Sat Nov 03 09:20:00 2007          1 normal         2 errors         0 warnings         1 marks
- Sat Nov 03 09:45:00 2007          1 normal         0 errors         0 warnings         0 marks
+ Sat Nov 03 09:20:00 2007          1 normal         2 errors         0 warnings         1 marks
+ Sat Nov 03 09:45:00 2007          1 normal         0 errors         0 warnings         0 marks

test/expected/test_cmds.sh_ccd326da92d1cacda63501cd1a3077381a18e8f2.out

@@ -1 +1 @@
- Sat Nov 03 00:00:00 2007          2 normal         2 errors         0 warnings         0 marks
+ Sat Nov 03 00:00:00 2007          2 normal         2 errors         0 warnings         0 marks

test/expected/test_cmds.sh_dbdd62995fdefc8318053af05a32416eccfa79fc.out

@@ -1 +1 @@
- Sat Nov 03 08:00:00 2007          2 normal         2 errors         0 warnings         0 marks
+ Sat Nov 03 08:00:00 2007          2 normal         2 errors         0 warnings         0 marks