From 1236b5491ed52f22d3d16177e286688220ffcc77 Mon Sep 17 00:00:00 2001 From: David Wendt Date: Sat, 2 Nov 2019 17:31:03 -0400 Subject: [PATCH] Ensure calls to `getURL`, invocations of `ActionGetURL`, and other functionality that writes locals doesn't panic due to double mutable borrows. --- core/src/avm1.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/avm1.rs b/core/src/avm1.rs index 89681dea1..057829c0d 100644 --- a/core/src/avm1.rs +++ b/core/src/avm1.rs @@ -102,11 +102,10 @@ impl<'gc> Avm1<'gc> { .read() .scope() .locals_cell(); + let keys = locals.read().get_keys(); - for k in locals.read().get_keys() { - let v = locals - .write(context.gc_context) - .get(&k, self, context, locals); + for k in keys { + let v = locals.read().get(&k, self, context, locals); form_values.insert(k, v.clone().into_string()); }