aboutsummaryrefslogtreecommitdiff
path: root/notify.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-07-30 14:33:19 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-07-30 14:33:19 +0000
commit0a5ba708e4a8448a0d29d4e263f939c9d1d2b953 (patch)
tree2b7cf3474d07b987d37956d1b4d6fc0485a81bbb /notify.c
parentreadme: IRC: update link to point to the web interface (diff)
notify: don't close FD 0
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.
Diffstat (limited to 'notify.c')
-rw-r--r--notify.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/notify.c b/notify.c
index 39e8db4e..7c5f0731 100644
--- a/notify.c
+++ b/notify.c
@@ -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);