diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-03-10 17:47:13 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-03-10 17:47:13 +0000 |
| commit | 8dead2a6c64e8589e06e1e218d40e63aea18a009 (patch) | |
| tree | 06b378e3bad3f987f64a557b4b7be72a829727f7 /extmod/re1.5/compilecode.c | |
| parent | b4c9a25eabcf67cdb4317a22cf2b3eeba9c4d7aa (diff) | |
| download | micropython-8dead2a6c64e8589e06e1e218d40e63aea18a009.tar.gz micropython-8dead2a6c64e8589e06e1e218d40e63aea18a009.zip | |
extmod: Pull in upstream changes to re1.5; fixes bugs with regex errors.
Diffstat (limited to 'extmod/re1.5/compilecode.c')
| -rw-r--r-- | extmod/re1.5/compilecode.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; |