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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/01 13:09:38

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

Log message:
        robustness improvement, fixes bug #22200.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5546&r2=1.5547
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5546
retrieving revision 1.5547
diff -u -b -r1.5546 -r1.5547
--- ChangeLog   1 Feb 2008 11:52:43 -0000       1.5546
+++ ChangeLog   1 Feb 2008 13:09:37 -0000       1.5547
@@ -1,5 +1,7 @@
 2008-02-01 Sandro Santilli <address@hidden>
 
+       * server/parser/button_character_def.cpp (read): robustness
+         improvement, fixes bug #22200.
        * server/asobj/xmlsocket.cpp (send): fix assertion. Fixes bug #22199.
 
 2008-01-31  Rob Savoye  <address@hidden>

Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/button_character_def.cpp      21 Jan 2008 20:56:00 -0000      
1.26
+++ server/parser/button_character_def.cpp      1 Feb 2008 13:09:38 -0000       
1.27
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: button_character_def.cpp,v 1.26 2008/01/21 20:56:00 rsavoye Exp $ */
+/* $Id: button_character_def.cpp,v 1.27 2008/02/01 13:09:38 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -82,7 +82,14 @@
                movie_definition* m, unsigned long endPos)
 {
        // caller should check this
-       assert(in->get_position() < endPos);
+       if (in->get_position()+1 > endPos)
+       {
+               IF_VERBOSE_MALFORMED_SWF(
+               log_swferror(_("   premature end of button record input stream, 
can't read flags"));
+               );
+               return false;
+       }
+
        int     flags = in->read_u8();
        if (flags == 0)
        {