summaryrefslogtreecommitdiff
path: root/indra/newview/lluploaddialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lluploaddialog.cpp')
-rw-r--r--indra/newview/lluploaddialog.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
index f91db06ef9..9bcc123eb5 100644
--- a/indra/newview/lluploaddialog.cpp
+++ b/indra/newview/lluploaddialog.cpp
@@ -83,8 +83,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 )
{