[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2267-gc12c3cf

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  c12c3cf104a095cff9791cdb3cee8bbf4853d5e0 (commit)
       via  54a08c95d6ab2a6b06564ef58e8f93055fb8ef87 (commit)
      from  982270fff22b80f7d3872f3696f4636053894ca4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=c12c3cf104a095cff9791cdb3cee8bbf4853d5e0


commit c12c3cf104a095cff9791cdb3cee8bbf4853d5e0
Author: Nutchanon Wetchasit <address@hidden>
Date:   Mon Feb 22 10:11:53 2016 +0100

    Drop incorrect error message triggered by specific ExternalInterface 
callback return value.
    
    See bug #47004 <https://savannah.gnu.org/bugs/?47004>

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 5041c6c..55e45c5 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -1679,12 +1679,7 @@ movie_root::processInvoke(ExternalInterface::invoke_t 
*invoke)
         ss << ExternalInterface::toXML(val);
         ss << std::endl;
     } else {
-        std::string result = callExternalCallback(invoke->name, invoke->args);
-        if (result == ExternalInterface::makeString("Error")) {
-            return false;
-        } else if (result == ExternalInterface::makeString("SecurityError")) {
-            return false;
-        }
+        callExternalCallback(invoke->name, invoke->args);
         return true;
     }
 

http://git.savannah.gnu.org/cgit//commit/?id=54a08c95d6ab2a6b06564ef58e8f93055fb8ef87


commit 54a08c95d6ab2a6b06564ef58e8f93055fb8ef87
Author: Nutchanon Wetchasit <address@hidden>
Date:   Mon Feb 22 10:11:40 2016 +0100

    Remove string-based error code generation in ExternalInterface callback 
implementation.
    
    See bug #47004 <https://savannah.gnu.org/bugs/?47004>

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 5faff86..5041c6c 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -1961,13 +1961,8 @@ movie_root::callExternalCallback(const std::string &name,
     }
 
     std::string result;
-    if (val.is_null()) {
-        // Return an error
-        result = ExternalInterface::makeString("Error");
-    } else {
-        result = ExternalInterface::toXML(val);
-    }
-        
+    result = ExternalInterface::toXML(val);
+
     // If the browser is connected, we send an Invoke message to the
     // browser.
     if (_hostfd >= 0) {

-----------------------------------------------------------------------

Summary of changes:
 libcore/movie_root.cpp |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Gnash