Fix for bug #626172: crash using unicode latin1 single char

Python 2.2.3 candidate.

Lib/test/test_unicode.py

@@ -434,6 +434,12 @@ vereq((u'ab' in 'abc'), True)
 vereq((u'ab' in (1,None,u'ab')), True)
 vereq((u'' in u'abc'), True)
 vereq(('' in u'abc'), True)
+try:
+    u'\xe2' in 'g\xe2teau'
+except UnicodeError:
+    pass
+else:
+    print '*** contains operator does not propagate UnicodeErrors'
 print 'done.'
 
 # Formatting:

Objects/unicodeobject.c

@@ -4485,10 +4485,8 @@ int PyUnicode_Contains(PyObject *container,
 	goto onError;
     }
     u = (PyUnicodeObject *)PyUnicode_FromObject(container);
-    if (u == NULL) {
-	Py_DECREF(v);
+    if (u == NULL)
 	goto onError;
-    }
 
     size = PyUnicode_GET_SIZE(v);
     rhs = PyUnicode_AS_UNICODE(v);