mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix reallocation bug in unicode.translate(): The code was comparing

Browse source 
characters instead of character pointers to determine space requirements.
This commit is contained in:
Walter Dörwald 2004-02-05 17:36:00 +00:00
parent bc875f5a36
commit cd736e71a3
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_unicode.py
View file

@ -136,6 +136,7 @@ class UnicodeTest(
self.checkequalnofix(u'iiix', u'abababc', 'translate', {ord('a'):None, ord('b'):ord('i'), ord('c'):u'x'}) 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'<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'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'hello'.translate)
self.assertRaises(TypeError, u'abababc'.translate, {ord('a'):''}) self.assertRaises(TypeError, u'abababc'.translate, {ord('a'):''})

2
Objects/unicodeobject.c
View file

@ -3283,7 +3283,7 @@ int charmaptranslate_output(const Py_UNICODE *startinp, const Py_UNICODE *curinp
else if (repsize!=0) { else if (repsize!=0) {
/* more than one character */ /* more than one character */
int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) +
(insize - (*curinp-*startinp)) + (insize - (curinp-startinp)) +
repsize - 1; repsize - 1;
if (charmaptranslate_makespace(outobj, outp, requiredsize)) if (charmaptranslate_makespace(outobj, outp, requiredsize))
return -1; return -1;