5 files changed, 20 insertions, 8 deletions

diff --git a/linden/indra/llmedia/llmediaimplcommon.cpp b/linden/indra/llmedia/llmediaimplcommon.cpp
index a0705bb..abb61e1 100644
--- a/linden/indra/llmedia/llmediaimplcommon.cpp
+++ b/linden/indra/llmedia/llmediaimplcommon.cpp
@@ -52,6 +52,7 @@
 LLMediaImplCommon::LLMediaImplCommon() :
         mMimeType( std::string() ),
         mInitialURL( std::string() ),
+        mImplMaker( NULL ),
         mAutoScaled( false ),
         mMediaWidth( 0 ),
         mMediaPrevWidth( 0 ),
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 8b0363a..5bf30d9 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -186,7 +186,8 @@ startup ( LLMediaManagerData* init_data )
                         WARNMSG("gst_segtrap_set_enabled() is not available; Automated crash-reporter may cease to function until next restart.");
 
                 // Protect against GStreamer resetting the locale, yuck.
-                std::string saved_locale = setlocale(LC_ALL, NULL);
+                static std::string saved_locale;
+                saved_locale = setlocale(LC_ALL, NULL);
                 if (0 == llgst_init_check(NULL, NULL, NULL))
                 {
                         WARNMSG("GST init failed for unspecified reason.");
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 53cb344..9e2564a 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -94,7 +94,8 @@ bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data )
         // the locale to protect it, as exotic/non-C locales
         // causes our code lots of general critical weirdness
         // and crashness. (SL-35450)
-        std::string saved_locale = setlocale(LC_ALL, NULL);
+        static std::string saved_locale;
+        saved_locale = setlocale(LC_ALL, NULL);
 #endif // LL_LINUX
 
         bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(),
@@ -132,7 +133,8 @@ bool LLMediaImplLLMozLib::init()
                 return false;
 
 #if LL_LINUX
-        std::string saved_locale = setlocale(LC_ALL, NULL);
+        static std::string saved_locale;
+        saved_locale = setlocale(LC_ALL, NULL);
 #endif // LL_LINUX
 
         mWindowId = LLMozLib::getInstance()->createBrowserWindow( mBrowserWindowWidth, mBrowserWindowHeight );
diff --git a/linden/indra/llmedia/llmediaimplquicktime.cpp b/linden/indra/llmedia/llmediaimplquicktime.cpp
index b126e2f..8f7686d 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.cpp
+++ b/linden/indra/llmedia/llmediaimplquicktime.cpp
@@ -116,11 +116,19 @@ bool LLMediaImplQuickTime::load( const std::string url )
         if ( url.empty() )
                 return false;
 
+        //In case std::string::c_str() makes a copy of the url data,
+        //make sure there is memory to hold it before allocating memory for handle.
+        //if fails, NewHandleClear(...) should return NULL.
+        const char* url_string = url.c_str() ;
         Handle handle = NewHandleClear( ( Size )( url.length() + 1 ) );
     if ( NULL == handle )
                 return false;
+        if(noErr != MemError() || NULL == *handle)
+        {
+                return false ;
+        }
 
-        BlockMove( url.c_str(), *handle, ( Size )( url.length() + 1 ) );
+        BlockMove( url_string, *handle, ( Size )( url.length() + 1 ) );
 
         //std::cout << "LLMediaImplQuickTime::load( " << url << " )" << std::endl;
 
diff --git a/linden/indra/llmedia/llmediaobserver.h b/linden/indra/llmedia/llmediaobserver.h
index ec9f881..079cb29 100644
--- a/linden/indra/llmedia/llmediaobserver.h
+++ b/linden/indra/llmedia/llmediaobserver.h
@@ -38,22 +38,22 @@ class LLMediaEvent
 {
         public:
                 LLMediaEvent( LLMediaBase* subject ) :
-                  mSubject( subject )
+                        mSubject( subject ), mIntValue(-1)
                         {
                         };
 
                 LLMediaEvent( LLMediaBase* subject, std::string in ) :
-                        mSubject( subject ), mStringValue(in)
+                        mSubject( subject ), mIntValue(-1), mStringValue(in)
                         {
                         };
 
                 LLMediaEvent( LLMediaBase* subject, std::string string_in, std::string string_ex_in ) :
-                        mSubject( subject ), mStringValue(string_in), mStringValueEx(string_ex_in)
+                        mSubject( subject ), mIntValue(-1), mStringValue(string_in), mStringValueEx(string_ex_in)
                         {
                         };
 
                 LLMediaEvent( LLMediaBase* subject, std::string string_in, int int_in ) :
-                        mSubject( subject ), mStringValue(string_in), mIntValue(int_in)
+                        mSubject( subject ), mIntValue(int_in), mStringValue(string_in)
                         {
                         };