From 305c74d5163c5e344a675d39ca2394a9e45bd2c2 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 2 Feb 2007 17:28:58 +0000
Subject: Result of svn merge -r57264:57370
 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

---
 indra/newview/lluploaddialog.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/lluploaddialog.cpp')

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 )
 	{
-- 
cgit v1.2.3