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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/23 16:32:02

Modified files:
        .              : ChangeLog 
        server         : as_object.cpp 

Log message:
                * server/as_object.cpp (get_prototype): don't return the Object
                  interface when prototype is NULL with SWF version < 5.
                  Fixes the empty swf3 case with GC.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3603&r2=1.3604
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.53&r2=1.54

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3603
retrieving revision 1.3604
diff -u -b -r1.3603 -r1.3604
--- ChangeLog   23 Jun 2007 12:34:31 -0000      1.3603
+++ ChangeLog   23 Jun 2007 16:32:01 -0000      1.3604
@@ -1,3 +1,9 @@
+2007-06-23 Sandro Santilli <address@hidden>
+
+       * server/as_object.cpp (get_prototype): don't return the Object
+         interface when prototype is NULL with SWF version < 5.
+         Fixes the empty swf3 case with GC.
+
 2007-06-23 Bastiaan Jacques <address@hidden>
 
        * libbase/container.h: Remove home-made container classes in

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/as_object.cpp        15 Jun 2007 15:00:28 -0000      1.53
+++ server/as_object.cpp        23 Jun 2007 16:32:01 -0000      1.54
@@ -619,7 +619,10 @@
 {
        if ( m_prototype ) return m_prototype.get();
        //log_msg(_("as_object::get_prototype(): Hit top of inheritance 
chain"));
-       return getObjectInterface();
+
+       // if SWF version < 5 the Object interface won't keep alive !
+       if ( _vm.getSWFVersion() > 4 ) return getObjectInterface();
+       return NULL;
 }
 
 #ifdef NEW_KEY_LISTENER_LIST_DESIGN