Re: [Gnash-commit] [patch #8715] Patch for fixing callback registration issue in ExternalInterface

[Richard Wilbur]

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 434f122..8d35546 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -1910,6 +1917,13 @@ movie_root::callExternalCallback(const std::string &name,
     } else {
         method = method_iterator->second;

+        // Look up for Object instance to use as "this" in the callback
+        instance_iterator = _externalCallbackInstances.find(name);
+        if (instance_iterator == _externalCallbackInstances.end()) {
+            instance = as_value((as_object*)NULL).to_object(getVM());
+        }
+        instance = instance_iterator->second;
+

In the code above instance is always set to instance_iterator->second.
Did you mean to do it in the following way?

+        // Look up for Object instance to use as "this" in the callback
+        instance_iterator = _externalCallbackInstances.find(name);
+        if (instance_iterator == _externalCallbackInstances.end()) {
+            instance = as_value((as_object*)NULL).to_object(getVM());
+        }
+        else {
+            instance = instance_iterator->second;
+        }
+