Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around a bug (I think) in the Python API PyUnicode_AsWideChar

Browse Source 
when the length of the unicode object is zero.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-01-16 03:30:18 +00:00
parent f83ca04634
commit 170531ee4b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/src/helpers.cpp
View File

@@ -1466,8 +1466,10 @@ wxString* wxString_in_helper(PyObject* source) {
if (PyUnicode_Check(source)) { if (PyUnicode_Check(source)) {
target = new wxString(); target = new wxString();
size_t len = PyUnicode_GET_SIZE(source); size_t len = PyUnicode_GET_SIZE(source);
PyUnicode_AsWideChar((PyUnicodeObject*)source, target->GetWriteBuf(len), len); if (len) {
target->UngetWriteBuf(); PyUnicode_AsWideChar((PyUnicodeObject*)source, target->GetWriteBuf(len), len);
target->UngetWriteBuf();
}
} else { } else {
// It is a string, get pointers to it and transform to unicode // It is a string, get pointers to it and transform to unicode
char* tmpPtr; int tmpSize; char* tmpPtr; int tmpSize;
@@ -1510,8 +1512,10 @@ wxString Py2wxString(PyObject* source)
#if wxUSE_UNICODE #if wxUSE_UNICODE
if (PyUnicode_Check(source)) { if (PyUnicode_Check(source)) {
size_t len = PyUnicode_GET_SIZE(source); size_t len = PyUnicode_GET_SIZE(source);
PyUnicode_AsWideChar((PyUnicodeObject*)source, target.GetWriteBuf(len), len); if (len) {
target.UngetWriteBuf(); PyUnicode_AsWideChar((PyUnicodeObject*)source, target.GetWriteBuf(len), len);
target.UngetWriteBuf();
}
} else { } else {
// It is a string, get pointers to it and transform to unicode // It is a string, get pointers to it and transform to unicode
char* tmpPtr; int tmpSize; char* tmpPtr; int tmpSize;