From: Walter Dörwald <walter@livinglogic.de>
Date: Sun, 9 Feb 2003 23:42:56 +0000 (+0000)
Subject: Fix two refcounting bugs
X-Git-Tag: v2.3c1~1953
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6b56aecad067f730d7fc6ae76cca94a26c3c896;p=python

Fix two refcounting bugs
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index dfeabf5e9a..6a358da6f1 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3256,6 +3256,7 @@ PyObject *PyUnicode_TranslateCharmap(const Py_UNICODE *p,
 	    Py_XDECREF(x);
 	    goto onError;
 	}
+	Py_XDECREF(x);
 	if (x!=Py_None) /* it worked => adjust input pointer */
 	    ++p;
 	else { /* untranslatable character */
@@ -3268,7 +3269,6 @@ PyObject *PyUnicode_TranslateCharmap(const Py_UNICODE *p,
 	    const Py_UNICODE *collend = p+1;
 	    const Py_UNICODE *coll;
 
-	    Py_XDECREF(x);
 	    /* find all untranslatable characters */
 	    while (collend < endp) {
 	    	if (charmaptranslate_lookup(*collend, mapping, &x))
@@ -5398,8 +5398,10 @@ unicode_replace(PyUnicodeObject *self, PyObject *args)
     if (str1 == NULL)
 	return NULL;
     str2 = (PyUnicodeObject *)PyUnicode_FromObject((PyObject *)str2);
-    if (str2 == NULL)
+    if (str2 == NULL) {
+	Py_DECREF(str1);
 	return NULL;
+    }
 
     result = replace(self, str1, str2, maxcount);