Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect conversion of python unicode objects to wchar_t strings in the winutil module

Browse Source 
This fixes the various strange windows specific errors or viewer/editor
shutdown in windows
This commit is contained in:
Kovid Goyal 2019-07-12 13:42:15 +05:30
parent 519a90abdf
commit f09f10ab8b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/calibre/utils/windows/winutilpp.cpp
View File

@ -71,7 +71,7 @@ class DeleteFileProgressSink : public IFileOperationProgressSink { // {{{
class wchar_raii { // {{{ class wchar_raii { // {{{
private: private:
wchar_t **handle; wchar_t *handle;
wchar_raii( const wchar_raii & ) ; wchar_raii( const wchar_raii & ) ;
wchar_raii & operator=( const wchar_raii & ) ; wchar_raii & operator=( const wchar_raii & ) ;
@ -80,15 +80,13 @@ class wchar_raii { // {{{
~wchar_raii() { ~wchar_raii() {
if (handle) { if (handle) {
#if PY_MAJOR_VERSION >= 3 PyMem_Free(handle);
PyMem_Free(*handle); handle = NULL;
#endif
*handle = NULL;
} }
} }
wchar_t *ptr() { return handle ? *handle : NULL; } wchar_t *ptr() { return handle; }
void set_ptr(wchar_t **val) { handle = val; } void set_ptr(wchar_t *val) { handle = val; }
}; // }}} }; // }}}
class scoped_com_initializer { // {{{ class scoped_com_initializer { // {{{
@ -102,6 +100,18 @@ class scoped_com_initializer { // {{{
scoped_com_initializer & operator=( const scoped_com_initializer & ) ; scoped_com_initializer & operator=( const scoped_com_initializer & ) ;
}; // }}} }; // }}}
#if PY_MAJOR_VERSION < 3
static wchar_t*
PyUnicode_AsWideCharString(PyObject *obj, Py_ssize_t *size) {
Py_ssize_t sz = PyUnicode_GET_SIZE(obj) * 4 + 4;
wchar_t *ans = (wchar_t*)PyMem_Malloc(sz);
memset(ans, 0, sz);
Py_ssize_t res = PyUnicode_AsWideChar(reinterpret_cast<PyUnicodeObject*>(obj), ans, (sz / sizeof(wchar_t)) - 1);
if (size) *size = res;
return ans;
}
#endif
static inline int static inline int
py_to_wchar(PyObject *obj, wchar_raii *output) { py_to_wchar(PyObject *obj, wchar_raii *output) {
if (!PyUnicode_Check(obj)) { if (!PyUnicode_Check(obj)) {
@ -109,11 +119,8 @@ py_to_wchar(PyObject *obj, wchar_raii *output) {
PyErr_SetString(PyExc_TypeError, "unicode object expected"); PyErr_SetString(PyExc_TypeError, "unicode object expected");
return 0; return 0;
} }
#if PY_MAJOR_VERSION < 3 wchar_t *buf = PyUnicode_AsWideCharString(obj, NULL);
output->set_ptr(&PyUnicode_AS_UNICODE(obj)); output->set_ptr(buf);
#else
output->set_ptr(&PyUnicode_AsWideCharString(obj, NULL));
#endif
return 1; return 1;
} }