[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp li...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/11 10:26:33

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp gnash.cpp 
        libbase        : rc.cpp rc.h 
        plugin/klash   : klash.cpp 
        server         : URLAccessManager.cpp 
        utilities      : parser.cpp processor.cpp 

Log message:
                * libbase/rc.{cpp,h}: made static initialization
                  of default RcInitFile predictable, by having
                  it happen at first call to a newly introduced
                  getDefaultInstance() static function. This
                  fixes one of many invalid accesses reported by
                  mudflap (see bug #18100)
                * gui/: Player.cpp, gnash.cpp, plugin/klash/klash.cpp,
                  server/URLAccessManager.cpp, utilities/: parser.cpp,
                  processor.cpp:
                  fetch global RcInitFile by using the new
                  RcInitFile::getDefaultInstance()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1584&r2=1.1585
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1584
retrieving revision 1.1585
diff -u -b -r1.1584 -r1.1585
--- ChangeLog   11 Nov 2006 00:54:52 -0000      1.1584
+++ ChangeLog   11 Nov 2006 10:26:32 -0000      1.1585
@@ -1,3 +1,17 @@
+2006-11-11 Sandro Santilli <address@hidden>
+
+       * libbase/rc.{cpp,h}: made static initialization
+         of default RcInitFile predictable, by having
+         it happen at first call to a newly introduced
+         getDefaultInstance() static function. This
+         fixes one of many invalid accesses reported by
+         mudflap (see bug #18100)
+       * gui/: Player.cpp, gnash.cpp, plugin/klash/klash.cpp,
+         server/URLAccessManager.cpp, utilities/: parser.cpp,
+         processor.cpp:
+         fetch global RcInitFile by using the new
+         RcInitFile::getDefaultInstance()
+
 2006-11-10 Markus Gothe <address@hidden>
 
        * backend/Makefile.am, gui/Makefile.am, libamf/Makefile.am, 

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gui/Player.cpp      9 Nov 2006 16:12:43 -0000       1.25
+++ gui/Player.cpp      11 Nov 2006 10:26:32 -0000      1.26
@@ -131,6 +131,7 @@
 //    rcfile.loadFiles();
 //    rcfile.dump();
 
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
     if (rcfile.useWriteLog()) {
         dbglogfile.setWriteDisk(true);
     }

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- gui/gnash.cpp       9 Nov 2006 19:07:23 -0000       1.58
+++ gui/gnash.cpp       11 Nov 2006 10:26:32 -0000      1.59
@@ -282,6 +282,7 @@
     }
 
     if ( ! specified_rendering_flag ) {
+       RcInitFile& rcfile = RcInitFile::getDefaultInstance();
        log_msg("no rendering flags specified, using rcfile");
         if ( called_by_plugin ) {
             player.setDoSound( rcfile.usePluginSound() );
@@ -314,6 +315,7 @@
 {
        gnash::Player player;
 
+       RcInitFile& rcfile = RcInitFile::getDefaultInstance();
        rcfile.loadFiles();
 
        parseCommandLine(argc, argv, player);

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/rc.cpp      9 Nov 2006 16:29:00 -0000       1.15
+++ libbase/rc.cpp      11 Nov 2006 10:26:33 -0000      1.16
@@ -40,7 +40,12 @@
 using namespace std;
 namespace gnash {
 
-RcInitFile rcfile;
+RcInitFile&
+RcInitFile::getDefaultInstance()
+{
+       static RcInitFile rcfile;
+       return rcfile;
+}
 
 
 RcInitFile::RcInitFile() : _delay(0),

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libbase/rc.h        9 Nov 2006 17:03:47 -0000       1.10
+++ libbase/rc.h        11 Nov 2006 10:26:33 -0000      1.11
@@ -37,6 +37,9 @@
     RcInitFile();
     ~RcInitFile();
 
+    // Return the default instance of RC file,
+    static RcInitFile& getDefaultInstance();
+
     bool loadFiles();
 
     bool parseFile(std::string filespec);
@@ -118,7 +121,7 @@
     bool _plugin_sound;                // whether sound is desired for the 
plugin
 };
 
-extern DSOEXPORT RcInitFile rcfile;
+//extern DSOEXPORT RcInitFile rcfile;
 
 // End of gnash namespace 
 }

Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- plugin/klash/klash.cpp      9 Nov 2006 17:03:48 -0000       1.22
+++ plugin/klash/klash.cpp      11 Nov 2006 10:26:33 -0000      1.23
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: klash.cpp,v 1.22 2006/11/09 17:03:48 strk Exp $ */
+/* $Id: klash.cpp,v 1.23 2006/11/11 10:26:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -279,6 +279,7 @@
 
     dbglogfile.setWriteDisk(false);
     
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
     rcfile.loadFiles();
 //    rcfile.dump();
 

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/URLAccessManager.cpp 9 Nov 2006 12:30:00 -0000       1.10
+++ server/URLAccessManager.cpp 11 Nov 2006 10:26:33 -0000      1.11
@@ -158,6 +158,8 @@
        using std::vector;
        using std::string;
 
+       RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+
        vector<string>::iterator it;
 
        vector<string> whitelist = rcfile.getWhiteList();
@@ -198,6 +200,8 @@
     
     assert( ! host.empty() );
     
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+    
     bool check_domain = rcfile.useLocalDomain();
     bool check_localhost = rcfile.useLocalHost();
 

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- utilities/parser.cpp        9 Nov 2006 17:03:48 -0000       1.28
+++ utilities/parser.cpp        11 Nov 2006 10:26:33 -0000      1.29
@@ -16,7 +16,7 @@
 // 
 //
 
-/* $Id: parser.cpp,v 1.28 2006/11/09 17:03:48 strk Exp $ */
+/* $Id: parser.cpp,v 1.29 2006/11/11 10:26:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -625,6 +625,7 @@
 
     std::vector<const char*> infiles;
       
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
     rcfile.loadFiles();
     if (rcfile.verbosityLevel() > 0) {
         dbglogfile.setVerbosity(rcfile.verbosityLevel());

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- utilities/processor.cpp     9 Nov 2006 22:47:14 -0000       1.34
+++ utilities/processor.cpp     11 Nov 2006 10:26:33 -0000      1.35
@@ -17,7 +17,7 @@
 //
 //
 
-/* $Id: processor.cpp,v 1.34 2006/11/09 22:47:14 strk Exp $ */
+/* $Id: processor.cpp,v 1.35 2006/11/11 10:26:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -108,6 +108,7 @@
  
     std::vector<const char*> infiles;
  
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
     rcfile.loadFiles();
     
     if (rcfile.verbosityLevel() > 0) {