KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignore invalid unicode condepoints in command lines

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-14 11:50:06 +05:30
parent 4fc8267264
commit 3ff8cc58e1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/child.c
View File

@ -24,11 +24,20 @@ serialize_string_tuple(PyObject *src) {
if (!ans) fatal("Out of memory"); if (!ans) fatal("Out of memory");
for (Py_ssize_t i = 0; i < sz; i++) { for (Py_ssize_t i = 0; i < sz; i++) {
const char *pysrc = PyUnicode_AsUTF8(PyTuple_GET_ITEM(src, i)); const char *pysrc = PyUnicode_AsUTF8(PyTuple_GET_ITEM(src, i));
if (!pysrc) {
PyErr_Clear();
DECREF_AFTER_FUNCTION PyObject *u8 = PyUnicode_AsEncodedString(PyTuple_GET_ITEM(src, i), "UTF-8", "ignore");
if (!u8) { PyErr_Print(); fatal("couldnt parse command line"); }
ans[i] = calloc(PyBytes_GET_SIZE(u8) + 1, sizeof(char));
if (ans[i] == NULL) fatal("Out of memory");
memcpy(ans[i], PyBytes_AS_STRING(u8), PyBytes_GET_SIZE(u8));
} else {
size_t len = strlen(pysrc); size_t len = strlen(pysrc);
ans[i] = calloc(len + 1, sizeof(char)); ans[i] = calloc(len + 1, sizeof(char));
if (ans[i] == NULL) fatal("Out of memory"); if (ans[i] == NULL) fatal("Out of memory");
memcpy(ans[i], pysrc, len); memcpy(ans[i], pysrc, len);
} }
}
return ans; return ans;
} }