aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-07-28 15:19:14 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-07-28 15:21:39 +1000
commit073ac425d5bf6f6393eb91d9b5f84e3caa68f511 (patch)
tree815a384ed1a54f390e46805c1ae0927449b29430 /sway/desktop
parent7ad9d743faa485b35ee5d38224736f445db071d2 (diff)
Fix use after free in transactions
In set_instructions_ready, calling set_instruction_ready may cause any number of transactions to get applied, which removes them from the list being iterated. The iteration variables need to be adjusted accordingly.
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/transaction.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index ee7a0704..0a24c4fc 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -364,7 +364,13 @@ static void set_instructions_ready(struct sway_view *view, int index) {
struct sway_transaction_instruction *instruction =
view->swayc->instructions->items[i];
if (!instruction->ready) {
+ // set_instruction_ready can remove instructions from the list we're
+ // iterating
+ size_t length = view->swayc->instructions->length;
set_instruction_ready(instruction);
+ size_t num_removed = length - view->swayc->instructions->length;
+ i -= num_removed;
+ index -= num_removed;
}
}
}