Backport of 1.26:

CFStringGetUnicode() returned an extra null character at the end of the string.
fixed.

diff --git a/Mac/Modules/cf/_CFmodule.c b/Mac/Modules/cf/_CFmodule.c
index d6dba45de379c36afbea95f8333499a59c649a39..7bb56e8f2de5dff4cf02323cf8dc6c53bd181f30 100644 (file)
--- a/Mac/Modules/cf/_CFmodule.c
+++ b/Mac/Modules/cf/_CFmodule.c
@@ -5,12 +5,7 @@
 
 
 
-#ifdef _WIN32
-#include "pywintoolbox.h"
-#else
-#include "macglue.h"
 #include "pymactoolbox.h"
-#endif
 
 /* Macro to test whether a weak-loaded CFM function exists */
 #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
@@ -2001,7 +1996,7 @@ static PyObject *CFStringRefObj_CFStringGetUnicode(CFStringRefObject *_self, PyO
        range.length = size;
        if( data == NULL ) return PyErr_NoMemory();
        CFStringGetCharacters(_self->ob_itself, range, data);
-       _res = (PyObject *)PyUnicode_FromUnicode(data, size);
+       _res = (PyObject *)PyUnicode_FromUnicode(data, size-1);
        free(data);
        return _res;
 

diff --git a/Mac/Modules/cf/cfsupport.py b/Mac/Modules/cf/cfsupport.py
index f27c58b1613eb99118dd0c0752e2476177262fa5..9c2880e61f0434b0b9bc5c3fd018fb8a116f86f5 100644 (file)
--- a/Mac/Modules/cf/cfsupport.py
+++ b/Mac/Modules/cf/cfsupport.py
@@ -558,7 +558,7 @@ range.location = 0;
 range.length = size;
 if( data == NULL ) return PyErr_NoMemory();
 CFStringGetCharacters(_self->ob_itself, range, data);
-_res = (PyObject *)PyUnicode_FromUnicode(data, size);
+_res = (PyObject *)PyUnicode_FromUnicode(data, size-1);
 free(data);
 return _res;
 """