mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

notify: don't close FD 0

Browse source 
This fixes a regression where closing a terminal instance, or hard- or
soft-resetting a terminal caused FD 0 to be closed.

This meant it became re-usable. Usually, by memfd_create() when
allocating a new surface buffer. So far nothing _really_ bad has
happened.

But what if FD 0 is now used by a memfd, and we close _another_
terminal instance?

This causes our memfd to be closed. And then, when e.g. trying to
scroll the terminal content: fallocate() fails with bad FD.
This commit is contained in:
Daniel Eklöf 2024-07-30 16:33:19 +02:00
parent a3ad740251
commit 0a5ba708e4
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
notify.c
View file

@ -505,10 +505,13 @@ notify_icon_del(struct terminal *term, const char *id)
void
notify_icon_free(struct notification_icon *icon)
{
if (icon->tmp_file_fd >= 0)
close(icon->tmp_file_fd);
if (icon->tmp_file_name != NULL)
if (icon->tmp_file_name != NULL) {
unlink(icon->tmp_file_name);
if (icon->tmp_file_fd >= 0) {
xassert(icon->tmp_file_fd > 0); // DEBUG
close(icon->tmp_file_fd);
}
}
free(icon->id);
free(icon->symbolic_name);

2
shm.c
View file

@ -255,7 +255,7 @@ instantiate_offset(struct buffer_private *buf, off_t new_offset)
void *mmapped = MAP_FAILED;
struct wl_buffer *wl_buf = NULL;
pixman_image_t **pix = xcalloc(buf->public.pix_instances, sizeof(*pix));
pixman_image_t **pix = xcalloc(buf->public.pix_instances, sizeof(pix[0]));
mmapped = (uint8_t *)pool->real_mmapped + new_offset;

4
terminal.c
View file

@ -1330,6 +1330,10 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
}
}
for (size_t i = 0; i < ALEN(term->notification_icons); i++) {
term->notification_icons[i].tmp_file_fd = -1;
}
add_utmp_record(conf, reaper, ptmx);
if (!pty_path) {