[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1870-g0103ff2

[Petter Reinholdtsen]

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  0103ff2b88d52a28d686fa63a3f3886ddf7da773 (commit)
      from  5524fc10e1c3e5420bf34bd22eba0905ef373e3e (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=0103ff2b88d52a28d686fa63a3f3886ddf7da773


commit 0103ff2b88d52a28d686fa63a3f3886ddf7da773
Author: Petter Reinholdtsen <address@hidden>
Date:   Sat Apr 19 15:41:47 2014 +0200

    Make sure _conditions member in ButtonAction::ButtonAction is always
    initialized, also when hitting malformed SWF (Coverity CID 1149280).
    Thanks to Bastiaan Jacques for the feedback on the correct default
    value.

diff --git a/libcore/swf/DefineButtonTag.cpp b/libcore/swf/DefineButtonTag.cpp
index 99e9ce6..e776b34 100644
--- a/libcore/swf/DefineButtonTag.cpp
+++ b/libcore/swf/DefineButtonTag.cpp
@@ -263,14 +263,11 @@ DefineButtonTag::hasKeyPressHandler() const
 ButtonAction::ButtonAction(SWFStream& in, TagType t, unsigned long endPos,
         movie_definition& mdef)
     :
-    _actions(mdef)
+    _actions(mdef),
+    _conditions(OVER_DOWN_TO_OVER_UP)
 {
     // Read condition flags.
-    if (t == SWF::DEFINEBUTTON) {
-        _conditions = OVER_DOWN_TO_OVER_UP;
-    }
-    else {
-        
+    if (t != SWF::DEFINEBUTTON) {
         assert(t == SWF::DEFINEBUTTON2);
 
         if ( in.tell()+2 > endPos ) 

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

Summary of changes:
 libcore/swf/DefineButtonTag.cpp |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash