[Python-checkins] python/dist/src/Objects unicodeobject.c, 2.190.6.5, 2.190.6.6

[jhylton at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv17511/Objects

Modified Files:
      Tag: release23-maint
	unicodeobject.c 
Log Message:
Backport: Double-fix of crash in Unicode freelist handling.


Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.190.6.5
retrieving revision 2.190.6.6
diff -C2 -d -r2.190.6.5 -r2.190.6.6
*** unicodeobject.c	27 Aug 2003 05:08:19 -0000	2.190.6.5
--- unicodeobject.c	16 Sep 2003 20:30:03 -0000	2.190.6.6
***************
*** 133,137 ****
      if (unicode == unicode_empty || 
  	(unicode->length == 1 && 
! 	 unicode->str[0] < 256 &&
  	 unicode_latin1[unicode->str[0]] == unicode)) {
          PyErr_SetString(PyExc_SystemError,
--- 133,137 ----
      if (unicode == unicode_empty || 
  	(unicode->length == 1 && 
! 	 unicode->str[0] < 256U &&
  	 unicode_latin1[unicode->str[0]] == unicode)) {
          PyErr_SetString(PyExc_SystemError,
***************
*** 212,215 ****
--- 212,216 ----
  	goto onError;
      }
+     unicode->str[0] = 0;
      unicode->str[length] = 0;
      unicode->length = length;