From 6cb6947b99e57ababc70fcc0fccd59038682c885 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 4 Mar 2015 13:51:32 +0000
Subject: [PATCH] extmod/ure: Correctly return None when a group has no match.

See issue #1122.
---
 extmod/modure.c           | 6 ++++++
 tests/extmod/ure_group.py | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/extmod/modure.c b/extmod/modure.c
index 62b72bd878..3f0256ad69 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -65,6 +65,10 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
     }
 
     const char *start = self->caps[no * 2];
+    if (start == NULL) {
+        // no match for this group
+        return mp_const_none;
+    }
     return mp_obj_new_str(start, self->caps[no * 2 + 1] - start, false);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(match_group_obj, match_group);
@@ -97,6 +101,7 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     subj.end = subj.begin + len;
     int caps_num = (self->re.sub + 1) * 2;
     mp_obj_match_t *match = m_new_obj_var(mp_obj_match_t, char*, caps_num);
+    memset(match->caps, 0, caps_num * sizeof(char*));
     int res = re1_5_recursiveloopprog(&self->re, &subj, match->caps, caps_num, is_anchored);
     if (res == 0) {
         m_del_var(mp_obj_match_t, char*, caps_num, match);
@@ -135,6 +140,7 @@ STATIC mp_obj_t re_split(uint n_args, const mp_obj_t *args) {
     mp_obj_t retval = mp_obj_new_list(0, NULL);
     const char **caps = alloca(caps_num * sizeof(char*));
     while (true) {
+        memset(caps, 0, caps_num * sizeof(char*));
         int res = re1_5_recursiveloopprog(&self->re, &subj, caps, caps_num, false);
 
         // if we didn't have a match, or had an empty match, it's time to stop
diff --git a/tests/extmod/ure_group.py b/tests/extmod/ure_group.py
index e402ce5759..8078a0a855 100644
--- a/tests/extmod/ure_group.py
+++ b/tests/extmod/ure_group.py
@@ -10,7 +10,7 @@ def print_groups(match):
     try:
         i = 0
         while True:
-            print(m.group(i))
+            print(match.group(i))
             i += 1
     except IndexError:
         pass
@@ -20,3 +20,9 @@ print_groups(m)
 
 m = re.match(r'([0-9]*)(([a-z]*)([0-9]*))','1234hello567')
 print_groups(m)
+
+# optional group that matches
+print_groups(re.match(r'(a)?b(c)', 'abc'))
+
+# optional group that doesn't match
+print_groups(re.match(r'(a)?b(c)', 'bc'))