diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-05-08 13:18:25 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-05-08 18:27:20 +0000 |
| commit | bfd3eb47ec164b289c0da812817629236acdc43d (patch) | |
| tree | 9d8d717a5a884a3d5094555e4c00d0b334bd3057 | |
| parent | term: osc8-open: assert URI in VT struct is NULL (diff) | |
term: reset: fix reset of the VT struct
1. Free buffers and strings
2. memset() the vt struct
3. re-initialize members that must not be zero
We _could_ replace the memset() with explicit zeroing of all the
members. It’s just that there’s a lot of arrays, so this is much
easier.
Closes #495
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | terminal.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e074583b..c5a37d82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,6 +81,9 @@ resulting in PGO build failures. * Wrong colors in the 256-color cube (https://codeberg.org/dnkl/foot/issues/479). +* Memory leak triggered by “opening” an OSC-8 URI and then resetting + the terminal without closing the URI + (https://codeberg.org/dnkl/foot/issues/495). ### Security @@ -1649,13 +1649,12 @@ term_reset(struct terminal *term, bool hard) term->scroll_region.start = 0; term->scroll_region.end = term->rows; + free(term->vt.osc8.uri); free(term->vt.osc.data); - memset(&term->vt, 0, sizeof(term->vt)); - term->vt.state = 0; /* GROUND */ + memset(&term->vt, 0, sizeof(term->vt)); + term->vt.state = 0; /* STATE_GROUND */ term->vt.osc8.begin = (struct coord){-1, -1}; - free(term->vt.osc8.uri); - term->vt.osc8.uri = NULL; if (term->grid == &term->alt) { term->grid = &term->normal; |
