[Gnash-commit] gnash ChangeLog server/parser/button_character_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/29 06:31:46

Modified files:
        .              : ChangeLog 
        server/parser  : button_character_def.cpp button_character_def.h 

Log message:
                * server/parser/button_character_def.{cpp,h}: don't let
                  gnash::button_action leak action_buffer objects.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3618&r2=1.3619
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3618
retrieving revision 1.3619
diff -u -b -r1.3618 -r1.3619
--- ChangeLog   29 Jun 2007 06:11:19 -0000      1.3618
+++ ChangeLog   29 Jun 2007 06:31:46 -0000      1.3619
@@ -1,5 +1,7 @@
 2007-06-28 Sandro Santilli <address@hidden>
 
+       * server/parser/button_character_def.{cpp,h}: don't let
+         gnash::button_action leak action_buffer objects.
        * server/FreetypeGlyphsProvider.cpp (getFontFilename): don't leak
          the FcFontSet when finding a match.
        * server/edit_text_character.{cpp,h}:

Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/button_character_def.cpp      19 Jun 2007 18:42:50 -0000      
1.13
+++ server/parser/button_character_def.cpp      29 Jun 2007 06:31:46 -0000      
1.14
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: button_character_def.cpp,v 1.13 2007/06/19 18:42:50 strk Exp $ */
+/* $Id: button_character_def.cpp,v 1.14 2007/06/29 06:31:46 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -38,7 +38,12 @@
 
 button_action::~button_action()
 {
-       m_actions.clear();
+       for (ActionList::iterator i=m_actions.begin(), e=m_actions.end();
+                       i != e; ++i)
+       {
+               delete (*i);
+       }
+       m_actions.clear(); // this is useless, will be done automatically
 }
 
 void   button_action::read(stream* in, int tag_type)

Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/button_character_def.h        19 Jun 2007 18:42:50 -0000      
1.16
+++ server/parser/button_character_def.h        29 Jun 2007 06:31:46 -0000      
1.17
@@ -94,7 +94,9 @@
                OVER_DOWN_TO_IDLE = 1 << 8
        };
        int     m_conditions;
-       std::vector<action_buffer*>     m_actions;
+
+       typedef std::vector<action_buffer*> ActionList;
+       ActionList m_actions;
 
        ~button_action();
        void    read(stream* in, int tag_type);