diff Objects/unicodeobject.c @ 63461:5af361adaae9 3.1

Recorded merge of revisions 83444 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r83444 | georg.brandl | 2010-08-01 22:51:02 +0200 (So, 01 Aug 2010) | 1 line Revert r83395, it introduces test failures and is not necessary anyway since we now have to nul-terminate the string anyway. ........
author Georg Brandl <georg@python.org>
date Sun, 01 Aug 2010 20:54:22 +0000
parents dbc8da813630
children 2ca842dcbe11
line wrap: on
line diff
--- a/Objects/unicodeobject.c	Sun Aug 01 20:12:04 2010 +0000
+++ b/Objects/unicodeobject.c	Sun Aug 01 20:54:22 2010 +0000
@@ -3597,7 +3597,7 @@
 
             ch2 = *s++;
             size--;
-            if (ch2 >= 0xDC00 && ch2 <= 0xDFFF && size) {
+            if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) {
                 ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000;
                 *p++ = '\\';
                 *p++ = 'U';
@@ -3839,7 +3839,7 @@
 
                 ch2 = *s++;
                 size--;
-                if (ch2 >= 0xDC00 && ch2 <= 0xDFFF && size) {
+                if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) {
                     ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000;
                     *p++ = '\\';
                     *p++ = 'U';