[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-31-g0da4bfd

[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  0da4bfd9dfce87bf9cf8dad047d600b0e6405281 (commit)
       via  eeb3b59ee14bb2b90f9ebb367154031ded35aa49 (commit)
      from  ef2448cf77a3f5b79a7bbb697b8f72e8b590fae0 (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=0da4bfd9dfce87bf9cf8dad047d600b0e6405281


commit 0da4bfd9dfce87bf9cf8dad047d600b0e6405281
Author: Sandro Santilli <address@hidden>
Date:   Wed Feb 9 23:05:52 2011 +0100

    Include check.h functionality

diff --git a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
index a3ce6d8..18dd528 100644
--- a/plugin/npapi/test.cpp
+++ b/plugin/npapi/test.cpp
@@ -29,11 +29,12 @@
 #include "pluginbase.h"
 #include "npfunctions.h"
 #include "dejagnu.h"
+#include "../../testsuite/check.h"
 #include <regex.h>
 
 #include "external.h"
 
-TestState runtest;
+TestState& runtest = _runtest;
 
 std::map<NPIdentifier, NPVariant *> _properties;
 std::map<NPIdentifier,  NPInvokeFunctionPtr> _methods;

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


commit eeb3b59ee14bb2b90f9ebb367154031ded35aa49
Author: Sandro Santilli <address@hidden>
Date:   Wed Feb 9 22:54:50 2011 +0100

    Make parseInvoke more robust when <invoke> tag isn't closed. Test that.

diff --git a/plugin/npapi/external.cpp b/plugin/npapi/external.cpp
index f84f832..c0bab59 100644
--- a/plugin/npapi/external.cpp
+++ b/plugin/npapi/external.cpp
@@ -237,8 +237,11 @@ ExternalInterface::parseInvoke(const std::string &xml)
             // extract the arguments to the method
             start = xml.find("<arguments>");
             end   = xml.find("</invoke");
-            tag   = xml.substr(start, end-start);
-            invoke->args = parseArguments(tag);
+            if (start != std::string::npos && end != std::string::npos )
+            {
+              tag   = xml.substr(start, end-start);
+              invoke->args = parseArguments(tag);
+            }
         }
     }
 
diff --git a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
index 12b09e3..a3ce6d8 100644
--- a/plugin/npapi/test.cpp
+++ b/plugin/npapi/test.cpp
@@ -285,6 +285,17 @@ main(int , char **)
         runtest.fail("plugin::ExternalInterface::parseInvoke()");
     }
 
+    // Test for bug #31766
+    xml = "<invoke name=\"reportFlashTiming\" 
returntype=\"xml\"><arguments><string>reportFlashTiming</string><object><property
 id=\"5\"><number>1297286708921</number></property><property 
id=\"4\"><string>vr</string></p";
+    invoke.reset ( plugin::ExternalInterface::parseInvoke(xml) );
+    if ((invoke->name == "reportFlashTiming") && (invoke->type == "xml")
+        && invoke->args.empty())
+    {
+        runtest.pass("plugin::ExternalInterface::parseInvoke() with missing 
closing invoke tag");
+    } else {
+        runtest.fail("plugin::ExternalInterface::parseInvoke() with missing 
closing invoke tag");
+    }
+
     regfree (&regex_pat);
     NPN_MemFree(value);
 }

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

Summary of changes:
 plugin/npapi/external.cpp |    7 +++++--
 plugin/npapi/test.cpp     |   14 +++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash