From 8dead2a6c64e8589e06e1e218d40e63aea18a009 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 10 Mar 2015 17:47:13 +0000
Subject: [PATCH] extmod: Pull in upstream changes to re1.5; fixes bugs with
 regex errors.

---
 extmod/re1.5/compilecode.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extmod/re1.5/compilecode.c b/extmod/re1.5/compilecode.c
index 42672a756b..0170c4417e 100644
--- a/extmod/re1.5/compilecode.c
+++ b/extmod/re1.5/compilecode.c
@@ -129,6 +129,7 @@ const char *_compilecode(const char *re, ByteProg *prog)
 
             prog->bytelen = pc;
             re = _compilecode(re + 1, prog);
+            if (re == NULL || *re != ')') return NULL; // error, or no matching paren
             pc = prog->bytelen;
 
             EMIT(pc++, Save);
@@ -138,12 +139,14 @@ const char *_compilecode(const char *re, ByteProg *prog)
             break;
         }
         case '?':
+            if (pc == term) return NULL; // nothing to repeat
             insert_code(code, term, 2, &pc);
             EMIT(term, Split);
             EMIT(term + 1, REL(term, pc));
             prog->len++;
             break;
         case '*':
+            if (pc == term) return NULL; // nothing to repeat
             insert_code(code, term, 2, &pc);
             EMIT(pc, Jmp);
             EMIT(pc + 1, REL(pc, term));
@@ -158,6 +161,7 @@ const char *_compilecode(const char *re, ByteProg *prog)
             prog->len += 2;
             break;
         case '+':
+            if (pc == term) return NULL; // nothing to repeat
             if (re[1] == '?') {
                 EMIT(pc, Split);
                 re++;
@@ -217,7 +221,8 @@ int re1_5_compilecode(ByteProg *prog, const char *re)
     prog->insts[prog->bytelen++] = 0;
     prog->len++;
 
-    _compilecode(re, prog);
+    re = _compilecode(re, prog);
+    if (re == NULL || *re) return 1;
 
     prog->insts[prog->bytelen++] = Save;
     prog->insts[prog->bytelen++] = 1;