[Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/03 20:54:47

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStream.cpp NetStream.h 

Log message:
                * server/asobj/NetStream.{cpp,h}: mark associated as_environment
                  as reachable (but I think there are ownership problem there,
                  the as_environment might be deleted before the NetStream 
object
                  is, in which case we'd access random memory).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3938&r2=1.3939
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3938
retrieving revision 1.3939
diff -u -b -r1.3938 -r1.3939
--- ChangeLog   3 Aug 2007 20:25:29 -0000       1.3938
+++ ChangeLog   3 Aug 2007 20:54:47 -0000       1.3939
@@ -1,5 +1,12 @@
 2007-08-02 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetStream.{cpp,h}: mark associated as_environment
+         as reachable (but I think there are ownership problem there,
+         the as_environment might be deleted before the NetStream object
+         is, in which case we'd access random memory).
+
+2007-08-02 Sandro Santilli <address@hidden>
+
        * configure.ac: make sure PKG_CONFIG is defined before calling 
          GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
          need to be put after it.

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/asobj/NetStream.cpp  1 Jul 2007 10:54:29 -0000       1.68
+++ server/asobj/NetStream.cpp  3 Aug 2007 20:54:47 -0000       1.69
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.68 2007/07/01 10:54:29 bjacques Exp $ */
+/* $Id: NetStream.cpp,v 1.69 2007/08/03 20:54:47 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -651,6 +651,8 @@
 
        if ( m_statusHandler ) m_statusHandler->setReachable();
 
+       if ( m_env ) m_env->markReachableResources();
+
        // Invoke generic as_object marker
        markAsObjectReachable();
 }

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/NetStream.h    1 Jul 2007 10:54:29 -0000       1.47
+++ server/asobj/NetStream.h    3 Aug 2007 20:54:47 -0000       1.48
@@ -19,7 +19,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.47 2007/07/01 10:54:29 bjacques Exp $ */
+/*  $Id: NetStream.h,v 1.48 2007/08/03 20:54:47 strk Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -121,7 +121,13 @@
        ///
        void processStatusNotifications();
 
-       // The actionscript enviroment for the AS callbacks
+       /// The actionscript enviroment for the AS callbacks
+       //
+       /// TODO: research on safety of this: who's the owner of the 
as_environment ?
+       ///       can we be sure that the environment won't be prematurely 
deleted ?
+       ///       We'd need an as_environment::testInvariant() to call in our 
own
+       ///       testInvariant() method (also TODO).
+       ///
        as_environment* m_env;
 
        // The size of the buffer in milliseconds
@@ -172,6 +178,7 @@
        /// Reachable resources are:
        ///     - associated NetConnection object (_netCon)
        ///     - onStatus event handler (m_statusHandler)
+       ///     - The associated as_environment (m_env)
        ///
        virtual void markReachableResources() const;
 
@@ -234,6 +241,7 @@
        /// Sets the AS Enviroment needed for eventhandlers
        //
        /// @param enviroment
+       ///     TODO: document ownership !!
        ///
        void setEnvironment(as_environment* env)
        {