1 files changed, 6 insertions, 1 deletions

diff --git a/linden/indra/newview/lluploaddialog.cpp b/linden/indra/newview/lluploaddialog.cpp
index a67aa7d..620133e 100644
--- a/linden/indra/newview/lluploaddialog.cpp
+++ b/linden/indra/newview/lluploaddialog.cpp
@@ -102,8 +102,13 @@ void LLUploadDialog::setMessage( const std::string& msg)
         char* temp_msg = new char[size];
         
         //strcpy(temp_msg,"Uploading...\n\n");
-        strcpy( temp_msg, msg.c_str());
+        if (temp_msg == NULL)
+        {
+                llerrs << "Memory Allocation Failed" << llendl;
+                return;
+        }
         
+        strcpy( temp_msg, msg.c_str());         /* Flawfinder: ignore */
         char* token = strtok( temp_msg, "\n" );
         while( token )
         {