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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/28 14:44:56

Modified files:
        .              : ChangeLog 
        server         : impl.cpp 

Log message:
        I broke it yesterday. Fix illegal reads.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6742&r2=1.6743
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.146&r2=1.147

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6742
retrieving revision 1.6743
diff -u -b -r1.6742 -r1.6743
--- ChangeLog   28 May 2008 14:00:40 -0000      1.6742
+++ ChangeLog   28 May 2008 14:44:54 -0000      1.6743
@@ -1,3 +1,8 @@
+2008-05-28 Benjamin Wolsey <address@hidden>
+
+       * server/impl.cpp: store a local copy of URL string to
+         prevent illegal reads.
+
 2008-05-28 Sandro Santilli <address@hidden>
 
        * server/button_character_instance.cpp,

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- server/impl.cpp     28 May 2008 08:37:13 -0000      1.146
+++ server/impl.cpp     28 May 2008 14:44:55 -0000      1.147
@@ -523,21 +523,23 @@
 create_movie(const URL& url, const char* reset_url, bool startLoaderThread, 
const std::string* postdata)
 {
 
+  const std::string swfurl = url.str();
+
   std::auto_ptr<tu_file> in;
   if ( postdata ) in.reset( globals::streamProvider.getStream(url, *postdata) 
);
   else in.reset( globals::streamProvider.getStream(url) );
   if ( ! in.get() )
   {
-      log_error(_("failed to open '%s'; can't create movie"), url.str());
+      log_error(_("failed to open '%s'; can't create movie"), swfurl);
       return NULL;
   }
   else if ( in->get_error() )
   {
-      log_error(_("streamProvider opener can't open '%s'"), url.str());
+      log_error(_("streamProvider opener can't open '%s'"), swfurl);
       return NULL;
   }
 
-  const char* movie_url = reset_url ? reset_url : url.str().c_str();
+  const char* movie_url = reset_url ? reset_url : swfurl.c_str();
   movie_definition* ret = create_movie(in, movie_url, startLoaderThread);
 
   return ret;