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

Fix another use after free caused by a re-assigned pointer

Browse Source
This commit is contained in:
Kovid Goyal 2021-02-28 12:30:12 +05:30
parent 945cbca387
commit 3ee7e5f800
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/history.c
View File

@ -397,7 +397,7 @@ pagerhist_write(HistoryBuf *self, PyObject *what) {
static PyObject* static PyObject*
pagerhist_as_bytes(HistoryBuf *self, PyObject *args UNUSED) { pagerhist_as_bytes(HistoryBuf *self, PyObject *args UNUSED) {
PagerHistoryBuf *ph = self->pagerhist; #define ph self->pagerhist
if (!ph || !ringbuf_bytes_used(ph->ringbuf)) return PyBytes_FromStringAndSize("", 0); if (!ph || !ringbuf_bytes_used(ph->ringbuf)) return PyBytes_FromStringAndSize("", 0);
pagerhist_ensure_start_is_valid_utf8(ph); pagerhist_ensure_start_is_valid_utf8(ph);
if (ph->rewrap_needed) pagerhist_rewrap_to(self, self->xnum); if (ph->rewrap_needed) pagerhist_rewrap_to(self, self->xnum);
@ -411,6 +411,7 @@ pagerhist_as_bytes(HistoryBuf *self, PyObject *args UNUSED) {
ringbuf_memcpy_from(buf, ph->ringbuf, sz); ringbuf_memcpy_from(buf, ph->ringbuf, sz);
if (!l.continued) buf[sz-1] = '\n'; if (!l.continued) buf[sz-1] = '\n';
return ans; return ans;
#undef ph
} }
static PyObject * static PyObject *