Add test for failure of the getattr call in pcre_expand() -- it used

to core dump if the first argument did not have a "group" attribute.

diff --git a/Modules/pcremodule.c b/Modules/pcremodule.c
index 60b702993b2a30e72f796fc038a2f9b752ca5ae9..f8bde043604ab9f34f16273bd093203073d0ac14 100644 (file)
--- a/Modules/pcremodule.c
+++ b/Modules/pcremodule.c
@@ -512,6 +512,10 @@ PyPcre_expand(self, args)
                        {
                                PyObject *r, *tuple, *result;
                                r=PyObject_GetAttrString(match_obj, "group");
+                               if (r == NULL) {
+                                       Py_DECREF(results);
+                                       return NULL;
+                               }
                                tuple=PyTuple_New(1);
                                Py_INCREF(value);
                                PyTuple_SetItem(tuple, 0, value);