[Gnash-commit] gnash ChangeLog utilities/processor.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/03 05:12:47

Modified files:
        .              : ChangeLog 
        utilities      : processor.cpp 

Log message:
                * utilities/processor.cpp: use an intrusive_ptr so that 
gprocessor
                  doesn't segfault with movie library limit of 1.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6776&r2=1.6777
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6776
retrieving revision 1.6777
diff -u -b -r1.6776 -r1.6777
--- ChangeLog   2 Jun 2008 20:15:19 -0000       1.6776
+++ ChangeLog   3 Jun 2008 05:12:47 -0000       1.6777
@@ -1,3 +1,8 @@
+2008-06-03 Benjamin Wolsey <address@hidden>
+
+       * utilities/processor.cpp: use an intrusive_ptr so that gprocessor
+         doesn't segfault with movie library limit of 1.
+
 2008-06-02 Sandro Santilli <address@hidden>
 
        * server/asobj/NetStreamFfmpeg.h: forward declare sound_handler.

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- utilities/processor.cpp     28 May 2008 08:37:13 -0000      1.100
+++ utilities/processor.cpp     3 Jun 2008 05:12:47 -0000       1.101
@@ -45,6 +45,7 @@
 #include "noseek_fd_adapter.h"
 #include "ManualClock.h"
 #include "StringPredicates.h"
+#include "smart_ptr.h"
 
 extern "C"{
        #include <unistd.h>
@@ -101,7 +102,7 @@
     std::string        m_filename;
 };
 
-static gnash::movie_definition*        play_movie(const char* filename);
+static boost::intrusive_ptr<gnash::movie_definition>   play_movie(const char* 
filename);
 
 static bool s_do_output = false;
 static bool s_stop_on_errors = true;
@@ -326,7 +327,7 @@
 
         set_base_url(URL(infiles[i]));
 
-       gnash::movie_definition*        m = play_movie(infiles[i]);
+       boost::intrusive_ptr<gnash::movie_definition> m = 
play_movie(infiles[i]);
        if (m == NULL) {
            if (s_stop_on_errors) {
                // Fail.
@@ -336,7 +337,7 @@
        }
        
        movie_data      md;
-       md.m_movie = m;
+       md.m_movie = m.get();
        md.m_filename = std::string(infiles[i]);
        data.push_back(md);
     }
@@ -356,10 +357,10 @@
 // or build font textures again.
 //
 // Return the movie definition.
-gnash::movie_definition*
+boost::intrusive_ptr<gnash::movie_definition>
 play_movie(const char* filename)
 {
-    gnash::movie_definition* md;
+    boost::intrusive_ptr<gnash::movie_definition> md;
     try
     {
       if ( ! strcmp(filename, "-") )