aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-07-04 22:58:17 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-07-04 22:58:17 +1000
commit50b401677be27103e7c4a67ca455d286f562ff7c (patch)
tree75dd1aba08ea3351523d3db33b74eba85cc9419e
parentf414885b1d1f09b92619dcedc4ec2d20b257a9aa (diff)
Fix use after free in transaction code
If we set an instruction as ready twice, it decreases the transaction's num_waiting a second time and applies the transaction earlier than it should. This no doubt has undesired effects, probably resulting in a use after free. Hopefully fixes the first part of #2207.
-rw-r--r--sway/desktop/transaction.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 7b670aec..b4d796cb 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -377,7 +377,9 @@ static void set_instructions_ready(struct sway_view *view, int index) {
for (int i = 0; i <= index; ++i) {
struct sway_transaction_instruction *instruction =
view->swayc->instructions->items[i];
- set_instruction_ready(instruction);
+ if (!instruction->ready) {
+ set_instruction_ready(instruction);
+ }
}
}