Skip to content

bpo-13153: _tkinter part of tkinter_pythoncmd_args_2 for paste fix #16365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
terryjreedy wants to merge 2 commits into from
Closed

bpo-13153: _tkinter part of tkinter_pythoncmd_args_2 for paste fix #16365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6d73e
bpo-13153: _tkinter part of tkinter_pythoncmd_args_2.patch
terryjreedy Sep 17, 2019
5e764bd
Merge remote-tracking branch 'origin/master' into astral
terryjreedy Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,16 +365,16 @@ WaitForMainloop(TkappObject* self)


static PyObject *
unicodeFromTclStringAndSize(const char *s, Py_ssize_t size)
unicodeFromTclStringAndSize(const char *s, Py_ssize_t size, const char *errors)
{
PyObject *r = PyUnicode_DecodeUTF8(s, size, NULL);
if (!r && PyErr_ExceptionMatches(PyExc_UnicodeDecodeError)) {
char *buf = NULL;
PyErr_Clear();
/* Tcl encodes null character as \xc0\x80 */
if (memchr(s, '\xc0', size)) {
char *buf, *q;
const char *e = s + size;
PyErr_Clear();
q = buf = (char *)PyMem_Malloc(size);
char *q = buf = (char *)PyMem_Malloc(size);
if (buf == NULL) {
PyErr_NoMemory();
return NULL;
Expand All @@ -389,25 +389,26 @@ unicodeFromTclStringAndSize(const char *s, Py_ssize_t size)
}
s = buf;
size = q - s;
r = PyUnicode_DecodeUTF8(s, size, NULL);
PyMem_Free(buf);
}
r = PyUnicode_DecodeUTF8(s, size, errors);
if (buf != NULL)
PyMem_Free(buf);
}
return r;
}

static PyObject *
unicodeFromTclString(const char *s)
{
return unicodeFromTclStringAndSize(s, strlen(s));
return unicodeFromTclStringAndSize(s, strlen(s), NULL);
}

static PyObject *
unicodeFromTclObj(Tcl_Obj *value)
{
int len;
char *s = Tcl_GetStringFromObj(value, &len);
return unicodeFromTclStringAndSize(s, len);
return unicodeFromTclStringAndSize(s, len, NULL);
}


Expand Down Expand Up @@ -1181,7 +1182,7 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
Tcl_Interp *interp = Tkapp_Interp(tkapp);

if (value->typePtr == NULL) {
return unicodeFromTclStringAndSize(value->bytes, value->length);
return unicodeFromTclStringAndSize(value->bytes, value->length, NULL);
}

if (value->typePtr == app->BooleanType ||
Expand Down Expand Up @@ -2238,7 +2239,9 @@ _tkinter_tkapp_splitlist(TkappObject *self, PyObject *arg)
goto finally;

for (i = 0; i < argc; i++) {
PyObject *s = unicodeFromTclString(argv[i]);
PyObject *s = unicodeFromTclStringAndSize(argv[i + 1],
strlen(argv[i + 1]),
"surrogateescape");
if (!s) {
Py_DECREF(v);
v = NULL;
Expand Down