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

[matthias.klose]

Author: matthias.klose
Date: Tue Apr  3 06:39:34 2007
New Revision: 54670

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Modules/_localemodule.c
Log:
- Fix an off-by-one bug in locale.strxfrm().

  Patch taken from http://bugs.debian.org/416934.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Apr  3 06:39:34 2007
@@ -220,6 +220,8 @@
 - Bug #1633621: if curses.resizeterm() or curses.resize_term() is called,
   update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS.
 
+- Fix an off-by-one bug in locale.strxfrm().
+
 Library
 -------
 

Modified: python/branches/release25-maint/Modules/_localemodule.c
==============================================================================
--- python/branches/release25-maint/Modules/_localemodule.c	(original)
+++ python/branches/release25-maint/Modules/_localemodule.c	Tue Apr  3 06:39:34 2007
@@ -360,7 +360,7 @@
     buf = PyMem_Malloc(n1);
     if (!buf)
         return PyErr_NoMemory();
-    n2 = strxfrm(buf, s, n1);
+    n2 = strxfrm(buf, s, n1) + 1;
     if (n2 > n1) {
         /* more space needed */
         buf = PyMem_Realloc(buf, n2);