Fix reallocation bug in unicode.translate(): The code was comparing
characters instead of character pointers to determine space requirements.
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 18a2d46..5ce2842 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -136,6 +136,7 @@
self.checkequalnofix(u'iiix', u'abababc', 'translate', {ord('a'):None, ord('b'):ord('i'), ord('c'):u'x'})
self.checkequalnofix(u'<i><i><i>c', u'abababc', 'translate', {ord('a'):None, ord('b'):u'<i>'})
self.checkequalnofix(u'c', u'abababc', 'translate', {ord('a'):None, ord('b'):u''})
+ self.checkequalnofix(u'xyyx', u'xzx', 'translate', {ord('z'):u'yy'})
self.assertRaises(TypeError, u'hello'.translate)
self.assertRaises(TypeError, u'abababc'.translate, {ord('a'):''})
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index a218ddb..e3bef57 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3283,7 +3283,7 @@
else if (repsize!=0) {
/* more than one character */
int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) +
- (insize - (*curinp-*startinp)) +
+ (insize - (curinp-startinp)) +
repsize - 1;
if (charmaptranslate_makespace(outobj, outp, requiredsize))
return -1;