mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-17 14:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a regression that broke writing to the clipboard using the OSC 5522 protocol

Browse Source 
Fixes #7858
This commit is contained in:
Kovid Goyal
2024-09-15 08:42:50 +05:30
parent 7537fa00e4
commit 481153318b
5 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kitty/data-types.c
View File

@@ -137,9 +137,15 @@ base64_decode_into(PyObject UNUSED *self, PyObject *args) {
typedef struct StreamingBase64Decoder {
PyObject_HEAD
struct base64_state state;
bool add_trailing_bytes;
bool add_trailing_bytes, needs_more_data;
} StreamingBase64Decoder;
static void
StreamingBase64Decoder_reset_(StreamingBase64Decoder *self) {
base64_stream_decode_init(&self->state, 0);
self->needs_more_data = false;
}
static int
StreamingBase64Decoder_init(PyObject *s, PyObject *args, PyObject *kwds UNUSED) {
if (PyTuple_GET_SIZE(args)) { PyErr_SetString(PyExc_TypeError, "constructor takes no arguments"); return -1; }
@@ -156,10 +162,17 @@ StreamingBase64Decoder_decode(StreamingBase64Decoder *self, PyObject *a) {
size_t sz = required_buffer_size_for_base64_decode(data.len);
RAII_PyObject(ans, PyBytes_FromStringAndSize(NULL, sz));
if (!ans) return NULL;
if (!base64_stream_decode(&self->state, data.buf, data.len, PyBytes_AS_STRING(ans), &sz)) {
int ret;
Py_BEGIN_ALLOW_THREADS
ret = base64_stream_decode(&self->state, data.buf, data.len, PyBytes_AS_STRING(ans), &sz);
Py_END_ALLOW_THREADS;
if (!ret) {
StreamingBase64Decoder_reset_(self);
PyErr_SetString(PyExc_ValueError, "Invalid base64 input data");
return NULL;
}
if (self->state.eof) StreamingBase64Decoder_reset_(self);
else self->needs_more_data = self->state.carry != 0 || self->state.bytes != 0;
if (_PyBytes_Resize(&ans, sz) != 0) return NULL;
return Py_NewRef(ans);
}
@@ -175,19 +188,30 @@ StreamingBase64Decoder_decode_into(StreamingBase64Decoder *self, PyObject *const
if (!src.buf || !src.len) return PyLong_FromLong(0);
size_t sz = required_buffer_size_for_base64_decode(src.len);
if ((Py_ssize_t)sz > data.len) { PyErr_SetString(PyExc_BufferError, "output buffer too small"); return NULL; }
if (!base64_stream_decode(&self->state, src.buf, src.len, data.buf, &sz)) {
int ret;
Py_BEGIN_ALLOW_THREADS
ret = base64_stream_decode(&self->state, src.buf, src.len, data.buf, &sz);
Py_END_ALLOW_THREADS
if (!ret) {
StreamingBase64Decoder_reset_(self);
PyErr_SetString(PyExc_ValueError, "Invalid base64 input data");
return NULL;
}
if (self->state.eof) StreamingBase64Decoder_reset_(self); else self->needs_more_data = true;
return PyLong_FromSize_t(sz);
}
static PyObject*
StreamingBase64Decoder_reset(StreamingBase64Decoder *self, PyObject *args UNUSED) {
base64_stream_decode_init(&self->state, 0);
StreamingBase64Decoder_reset_(self);
Py_RETURN_NONE;
}
static PyObject*
StreamingBase64Decoder_needs_more_data(StreamingBase64Decoder *self, PyObject *args UNUSED) {
return Py_NewRef(self->needs_more_data ? Py_True : Py_False);
}
static PyTypeObject StreamingBase64Decoder_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
.tp_name = "kitty.fast_data_types.StreamingBase64Decoder",
@@ -198,6 +222,7 @@ static PyTypeObject StreamingBase64Decoder_Type = {
{"decode", (PyCFunction)StreamingBase64Decoder_decode, METH_O, ""},
{"decode_into", (PyCFunction)(void(*)(void))StreamingBase64Decoder_decode_into, METH_FASTCALL, ""},
{"reset", (PyCFunction)StreamingBase64Decoder_reset, METH_NOARGS, ""},
{"needs_more_data", (PyCFunction)StreamingBase64Decoder_needs_more_data, METH_NOARGS, ""},
{NULL, NULL, 0, NULL},
},
.tp_new = PyType_GenericNew,
@@ -225,7 +250,9 @@ StreamingBase64Encoder_encode(StreamingBase64Decoder *self, PyObject *a) {
size_t sz = required_buffer_size_for_base64_encode(data.len);
RAII_PyObject(ans, PyBytes_FromStringAndSize(NULL, sz));
if (!ans) return NULL;
Py_BEGIN_ALLOW_THREADS
base64_stream_encode(&self->state, data.buf, data.len, PyBytes_AS_STRING(ans), &sz);
Py_END_ALLOW_THREADS
if (_PyBytes_Resize(&ans, sz) != 0) return NULL;
return Py_NewRef(ans);
}
@@ -241,7 +268,9 @@ StreamingBase64Encoder_encode_into(StreamingBase64Decoder *self, PyObject *const
if (!src.buf || !src.len) return PyLong_FromLong(0);
size_t sz = required_buffer_size_for_base64_encode(src.len);
if ((Py_ssize_t)sz > data.len) { PyErr_SetString(PyExc_BufferError, "output buffer too small"); return NULL; }
Py_BEGIN_ALLOW_THREADS
base64_stream_encode(&self->state, src.buf, src.len, data.buf, &sz);
Py_END_ALLOW_THREADS
return PyLong_FromSize_t(sz);
}