[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/31 22:05:54

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp (sprite_attach_movie):
                  tolerate bogus third argument to attachMovie().
                  Fixes bug #18920.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2211&r2=1.2212
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.145&r2=1.146

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2211
retrieving revision 1.2212
diff -u -b -r1.2211 -r1.2212
--- ChangeLog   31 Jan 2007 21:10:01 -0000      1.2211
+++ ChangeLog   31 Jan 2007 22:05:54 -0000      1.2212
@@ -1,3 +1,9 @@
+2007-01-31 Sandro Santilli <address@hidden>
+
+       * server/sprite_instance.cpp (sprite_attach_movie):
+         tolerate bogus third argument to attachMovie().
+         Fixes bug #18920.
+
 2007-01-31 Martin Guy <address@hidden>
 
        * configure.ac: Remove check for png.h; it is not a Gnash dependency.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- server/sprite_instance.cpp  31 Jan 2007 21:10:01 -0000      1.145
+++ server/sprite_instance.cpp  31 Jan 2007 22:05:54 -0000      1.146
@@ -225,9 +225,16 @@
        /// because attachCharacter() will reset matrix !!
        if (fn.nargs > 3 ) {
                as_object* initObject = fn.arg(3).to_object();
-               assert(initObject);
+               if ( initObject ) {
                log_msg("Initializing properties from object");
                newch->copyProperties(*initObject);
+               } else {
+                       IF_VERBOSE_MALFORMED_SWF(
+                       log_aserror("Third argument to attachMovie "
+                               "doesn't cast to an object (%s)",
+                               fn.arg(3).to_string());
+                       );
+               }
        }
 
        fn.result->set_as_object(newch.get());