Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index dfaf872d92..05897c6bd9 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -499,14 +499,15 @@ void LLPanelLogin::setFields(const std::string& firstname, const std::string& la
 		// nice row of asterixes.
 		const char* filler = "123456789!123456";
 		sInstance->childSetText("password_edit", filler);
-		strcpy(sInstance->mIncomingPassword, filler);
-		strcpy(sInstance->mMungedPassword, password.c_str());
+		strcpy(sInstance->mIncomingPassword, filler); 		/*Flawfinder: ignore*/
+		strcpy(sInstance->mMungedPassword, password.c_str());	/*Flawfinder: ignore*/
 	}
 	else
 	{
 		// this is a normal text password
 		sInstance->childSetText("password_edit", password);
-		strcpy(sInstance->mIncomingPassword, password.c_str());
+		strncpy(sInstance->mIncomingPassword, password.c_str(), sizeof(sInstance->mIncomingPassword) -1);    /*Flawfinder: ignore*/
+                sInstance->mIncomingPassword[sizeof(sInstance->mIncomingPassword) -1] = '\0';
 		LLMD5 pass((unsigned char *)password.c_str());
 		pass.hex_digest(sInstance->mMungedPassword);
 	}