[Python-checkins] r72845 - in python/branches/release30-maint: Misc/NEWS Modules/_localemodule.c

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat May 23 12:44:10 2009
New Revision: 72845

Log:
Merged revisions 72844 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r72844 | martin.v.loewis | 2009-05-23 12:38:26 +0200 (Sa, 23 Mai 2009) | 2 lines
  
  Issue #6093: Fix off-by-one error in locale.strxfrm.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Misc/NEWS
   python/branches/release30-maint/Modules/_localemodule.c

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sat May 23 12:44:10 2009
@@ -160,6 +160,11 @@
 - Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
   new arguments introduced in 2.5.
 
+Extension Modules
+-----------------
+
+- Issue #6093: Fix off-by-one error in locale.strxfrm.
+
 Build
 -----
 

Modified: python/branches/release30-maint/Modules/_localemodule.c
==============================================================================
--- python/branches/release30-maint/Modules/_localemodule.c	(original)
+++ python/branches/release30-maint/Modules/_localemodule.c	Sat May 23 12:44:10 2009
@@ -314,7 +314,7 @@
             PyErr_NoMemory();
             goto exit;
         }
-        n2 = wcsxfrm(buf, s, n2);
+        n2 = wcsxfrm(buf, s, n2+1);
     }
     result = PyUnicode_FromWideChar(buf, n2);
  exit: