From ad94bca0d273869d6358719f4dbd515a905acd26 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 24 Jan 2007 20:21:23 +0000
Subject: merge -r 56696:57082 Branch_1-13-2

---
 indra/newview/llviewerobject.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 0d1910429e..0f1479af68 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2377,6 +2377,7 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
 	if(ifs.good())
 	{
 		char buffer[MAX_STRING];
+		// *NOTE: This buffer size is hard coded into scanf() below.
 		char keyword[MAX_STRING];
 		if(mInventory)
 		{
@@ -2389,7 +2390,7 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
 		while(ifs.good())
 		{
 			ifs.getline(buffer, MAX_STRING);
-			sscanf(buffer, " %s", keyword);
+			sscanf(buffer, " %254s", keyword);
 			if(0 == strcmp("inv_item", keyword))
 			{
 				LLPointer<LLInventoryObject> inv = new LLViewerInventoryItem;
-- 
cgit v1.2.3