[Gnash-commit] gnash ChangeLog server/swf/PlaceObject2Tag.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/15 13:08:07

Modified files:
        .              : ChangeLog 
        server/swf     : PlaceObject2Tag.cpp 

Log message:
                * server/swf/PlaceObject2Tag.cpp (readPlaceActions): don't 
abort when
                  reserved flag != 0.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3226&r2=1.3227
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3226
retrieving revision 1.3227
diff -u -b -r1.3226 -r1.3227
--- ChangeLog   15 May 2007 13:01:27 -0000      1.3226
+++ ChangeLog   15 May 2007 13:08:07 -0000      1.3227
@@ -1,3 +1,8 @@
+2007-05-15 Sandro Santilli <address@hidden>
+
+       * server/swf/PlaceObject2Tag.cpp (readPlaceActions): don't abort when
+         reserved flag != 0.
+
 2007-05-15 Tomas Groth Christensen <address@hidden>
 
        * server/asobj/NetStream.{cpp.h}, server/asobj/NetStreamFfmpeg.{cpp,h},

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/swf/PlaceObject2Tag.cpp      12 May 2007 06:50:37 -0000      1.8
+++ server/swf/PlaceObject2Tag.cpp      15 May 2007 13:08:07 -0000      1.9
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.8 2007/05/12 06:50:37 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.9 2007/05/15 13:08:07 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -68,7 +68,12 @@
 {
 
        uint16_t reserved = in->read_u16();
-       assert(reserved == 0);  // must be 0
+       IF_VERBOSE_MALFORMED_SWF (
+               if ( reserved != 0 ) // must be 0
+               {
+                       log_swferror(_("Reserved field in PlaceObject actions 
== %u (expected 0)"), reserved);
+               }
+       );
        
        // The logical 'or' of all the following handlers.
        all_event_flags = (movie_version >= 6) ? in->read_u32() : 
in->read_u16();