circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-09 03:34:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5382 from YayoRazo/fix/sixel-saved-images-uaf

Browse Source 
fix(screen): free alternate-screen images on screen destroy
This commit is contained in:
Nicholas Marriott
2026-07-12 21:40:02 +01:00
committed by GitHub
parent a53a0aa0b5 28a1231100
commit ea236c12a6
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
screen.c
View File

@@ -152,6 +152,10 @@ screen_reset_hyperlinks(struct screen *s)
void void
screen_free(struct screen *s) screen_free(struct screen *s)
{ {
#ifdef ENABLE_SIXEL
struct image *im;
#endif
free(s->sel); free(s->sel);
free(s->tabs); free(s->tabs);
free(s->path); free(s->path);
@@ -169,6 +173,14 @@ screen_free(struct screen *s)
screen_free_titles(s); screen_free_titles(s);
#ifdef ENABLE_SIXEL #ifdef ENABLE_SIXEL
/*
* Images saved when entering the alternate screen stay linked in the
* global list; move them back so they are freed and unlinked here, or
* a later eviction would write through this freed screen.
*/
TAILQ_CONCAT(&s->images, &s->saved_images, entry);
TAILQ_FOREACH(im, &s->images, entry)
im->list = &s->images;
image_free_all(s); image_free_all(s);
#endif #endif
} }