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

Fix crash caused by incorrect re-allocation of tabstops on resize

Browse Source
This commit is contained in:
Kovid Goyal 2016-11-24 16:39:47 +05:30
parent abd09464f0
commit 9a0f057012
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/screen.c
View File

@ -14,6 +14,15 @@
static const ScreenModes empty_modes = {0, .mDECAWM=true, .mDECTCEM=true}; static const ScreenModes empty_modes = {0, .mDECAWM=true, .mDECTCEM=true};
// Constructor/destructor {{{ // Constructor/destructor {{{
static inline void
init_tabstops(Screen *self) {
// In terminfo we specify the number of initial tabstops (it) as 8
for (unsigned int t=0; t < self->columns; t++) {
self->tabstops[t] = (t+1) % 8 == 0 ? true : false;
}
}
static PyObject* static PyObject*
new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) { new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) {
Screen *self; Screen *self;
@ -37,6 +46,7 @@ new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) {
if (self->cursor == NULL || self->main_linebuf == NULL || self->alt_linebuf == NULL || self->change_tracker == NULL || self->tabstops == NULL || self->historybuf == NULL) { if (self->cursor == NULL || self->main_linebuf == NULL || self->alt_linebuf == NULL || self->change_tracker == NULL || self->tabstops == NULL || self->historybuf == NULL) {
Py_CLEAR(self); return NULL; Py_CLEAR(self); return NULL;
} }
init_tabstops(self);
} }
return (PyObject*) self; return (PyObject*) self;
} }
@ -47,9 +57,8 @@ void screen_reset(Screen *self) {
self->modes = empty_modes; self->modes = empty_modes;
self->utf8_state = 0; self->utf8_state = 0;
self->margin_top = 0; self->margin_bottom = self->lines - 1; self->margin_top = 0; self->margin_bottom = self->lines - 1;
// In terminfo we specify the number of initial tabstops (it) as 8
for (unsigned int t=0; t < self->columns; t++) self->tabstops[t] = t > 0 && (t+1) % 8 == 0;
screen_normal_keypad_mode(self); screen_normal_keypad_mode(self);
init_tabstops(self);
cursor_reset(self->cursor); cursor_reset(self->cursor);
tracker_cursor_changed(self->change_tracker); tracker_cursor_changed(self->change_tracker);
screen_cursor_position(self, 1, 1); screen_cursor_position(self, 1, 1);
@ -92,13 +101,14 @@ static bool screen_resize(Screen *self, unsigned int lines, unsigned int columns
self->linebuf = is_main ? self->main_linebuf : self->alt_linebuf; self->linebuf = is_main ? self->main_linebuf : self->alt_linebuf;
if (!tracker_resize(self->change_tracker, lines, columns)) return false; if (!tracker_resize(self->change_tracker, lines, columns)) return false;
self->lines = lines; self->columns = columns;
self->margin_top = 0; self->margin_bottom = self->lines - 1;
PyMem_Free(self->tabstops); PyMem_Free(self->tabstops);
self->tabstops = PyMem_Calloc(self->columns, sizeof(bool)); self->tabstops = PyMem_Calloc(self->columns, sizeof(bool));
if (self->tabstops == NULL) { PyErr_NoMemory(); return false; } if (self->tabstops == NULL) { PyErr_NoMemory(); return false; }
init_tabstops(self);
self->lines = lines; self->columns = columns;
self->margin_top = 0; self->margin_bottom = self->lines - 1;
return true; return true;
} }