url-mode: fix crash when removing duplicate and/or overlapping URLs

Removing overlaping and duplicated URLs is done by running two nested
loops, that both iterate the same URL list.

When a duplicate is found, one of the URLs is destroyed and removed
from the list.

Deleting and removing an item *is* safe, but only as long as _no
other_ iterator has references to it.

In this case, if we remove an item from e.g. the inner iterator, we’ll
crash if the outer iterator’s *next* item is the item being removed.

Closes #627
This commit is contained in:
Daniel Eklöf 2021-07-11 10:06:12 +02:00
parent a9872aac5a
commit cf6d04f9f2
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 14 additions and 7 deletions

View file

@ -51,6 +51,8 @@
last column, and `tweak.allow-overflowing-double-width-glyphs=yes`. last column, and `tweak.allow-overflowing-double-width-glyphs=yes`.
* FD exhaustion when repeatedly entering/exiting URL mode with many * FD exhaustion when repeatedly entering/exiting URL mode with many
URLs. URLs.
* Double free of URL while removing duplicated and/or overlapping URLs
in URL mode (https://codeberg.org/dnkl/foot/issues/627).
### Security ### Security

View file

@ -264,6 +264,7 @@ struct url {
enum url_action action; enum url_action action;
bool url_mode_dont_change_url_attr; /* Entering/exiting URL mode doesnt touch the cells attr.url */ bool url_mode_dont_change_url_attr; /* Entering/exiting URL mode doesnt touch the cells attr.url */
bool osc8; bool osc8;
bool duplicate;
}; };
typedef tll(struct url) url_list_t; typedef tll(struct url) url_list_t;

View file

@ -470,16 +470,20 @@ remove_overlapping(url_list_t *urls, int cols)
*/ */
xassert(in->osc8 || out->osc8); xassert(in->osc8 || out->osc8);
if (in->osc8) { if (in->osc8)
url_destroy(&outer->item); outer->item.duplicate = true;
tll_remove(*urls, outer); else
} else { inner->item.duplicate = true;
url_destroy(&inner->item);
tll_remove(*urls, inner);
}
} }
} }
} }
tll_foreach(*urls, it) {
if (it->item.duplicate) {
url_destroy(&it->item);
tll_remove(*urls, it);
}
}
} }
void void