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 1f44a8eaef8fa80fb9d0b1a6718728ffaa4b6fbe..85433319fc27ec8a48276c049bae28379e7847b6 100644 (file)
--- a/Mac/Modules/cf/_CFmodule.c
+++ b/Mac/Modules/cf/_CFmodule.c
@@ -2349,7 +2349,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 c244c727dc755fe654c70e660902b60c961c3d19..f236e6d374effa24a6d25594ec52d32ed07eaff9 100644 (file)
--- a/Mac/Modules/cf/cfsupport.py
+++ b/Mac/Modules/cf/cfsupport.py
@@ -575,7 +575,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;
 """