fixed a memory leak in pattern cleanup (patch #103248 by cgw)

Fredrik Lundh · Fredrik Lundh · commit 6f5cba68fcf7 · 2001-01-16T07:05:29.000Z
diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -24,7 +24,8 @@
  * 2000-10-24 fl  really fixed assert_not; reset groups in findall
  * 2000-12-21 fl  fixed memory leak in groupdict
  * 2001-01-02 fl  properly reset pointer after failed assertion in MIN_UNTIL
- * 2001-01-15 fl  don't use recursion for unbounded MIN_UTIL
+ * 2001-01-15 fl  don't use recursion for unbounded MIN_UTIL; fixed
+ * 2001-01-16 fl  fixed memory leak in pattern destructor
  *
  * Copyright (c) 1997-2001 by Secret Labs AB.  All rights reserved.
  *
@@ -1234,8 +1235,10 @@ _compile(PyObject* self_, PyObject* args)
 
     Py_DECREF(code);
 
-    if (PyErr_Occurred())
+    if (PyErr_Occurred()) {
+        PyObject_DEL(self);
         return NULL;
+    }
 
     Py_INCREF(pattern);
     self->pattern = pattern;
@@ -1532,6 +1535,7 @@ pattern_dealloc(PatternObject* self)
 {
     Py_XDECREF(self->pattern);
     Py_XDECREF(self->groupindex);
+    Py_XDECREF(self->indexgroup);
     PyObject_DEL(self);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@`
`24`	`24`	`* 2000-10-24 fl really fixed assert_not; reset groups in findall`
`25`	`25`	`* 2000-12-21 fl fixed memory leak in groupdict`
`26`	`26`	`* 2001-01-02 fl properly reset pointer after failed assertion in MIN_UNTIL`
`27`		`- * 2001-01-15 fl don't use recursion for unbounded MIN_UTIL`
	`27`	`+ * 2001-01-15 fl don't use recursion for unbounded MIN_UTIL; fixed`
	`28`	`+ * 2001-01-16 fl fixed memory leak in pattern destructor`
`28`	`29`	`*`
`29`	`30`	`* Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved.`
`30`	`31`	`*`
`@@ -1234,8 +1235,10 @@ _compile(PyObject* self_, PyObject* args)`
`1234`	`1235`
`1235`	`1236`	`Py_DECREF(code);`
`1236`	`1237`
`1237`		`- if (PyErr_Occurred())`
	`1238`	`+ if (PyErr_Occurred()) {`
	`1239`	`+ PyObject_DEL(self);`
`1238`	`1240`	`return NULL;`
	`1241`	`+ }`
`1239`	`1242`
`1240`	`1243`	`Py_INCREF(pattern);`
`1241`	`1244`	`self->pattern = pattern;`
`@@ -1532,6 +1535,7 @@ pattern_dealloc(PatternObject* self)`
`1532`	`1535`	`{`
`1533`	`1536`	`Py_XDECREF(self->pattern);`
`1534`	`1537`	`Py_XDECREF(self->groupindex);`
	`1538`	`+ Py_XDECREF(self->indexgroup);`
`1535`	`1539`	`PyObject_DEL(self);`
`1536`	`1540`	`}`
`1537`	`1541`