_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

terminal: fix nil pointer dereference in pty.Getsize 

pty.Getsize() is used in the Draw function of the terminal widget and wraps the
pty.GetsizeFull() function. However, pty.Getsize does not check the returned
error from pty.GetsizeFull before dereferencing the winsize struct. In case of
an error, this will cause a nil pointer deference and panic.

This has been reported in the upstream package, but in the meantime, we can
directly use pty.GetsizeFull.

References: https://todo.sr.ht/~rjarry/aerc/11
Signed-off-by: Koni Marti <koni.marti@gmail.com>
This commit is contained in:
Koni Marti 2022-01-19 21:32:31 +01:00 committed by Robin Jarry
parent 22ad9e199a
commit 7f34cab5e5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
widgets/terminal.go
View File

@ -254,10 +254,13 @@ func (term *Terminal) Draw(ctx *ui.Context) {
} }
} }
rows, cols, err := pty.Getsize(term.pty) ws, err := pty.GetsizeFull(term.pty)
if err != nil { if err != nil {
return return
} }
rows := int(ws.Rows)
cols := int(ws.Cols)
if ctx.Width() != cols || ctx.Height() != rows { if ctx.Width() != cols || ctx.Height() != rows {
term.writeMutex.Lock() term.writeMutex.Lock()
pty.Setsize(term.pty, &winsize) pty.Setsize(term.pty, &winsize)