From ad94bca0d273869d6358719f4dbd515a905acd26 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 24 Jan 2007 20:21:23 +0000 Subject: merge -r 56696:57082 Branch_1-13-2 --- indra/newview/llviewerkeyboard.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewerkeyboard.cpp') diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 8f31f1192a..714087e701 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -685,6 +685,7 @@ S32 LLViewerKeyboard::loadBindings(const char *filename) FILE *fp; const S32 BUFFER_SIZE = 2048; char buffer[BUFFER_SIZE]; + // *NOTE: This buffer size is hard coded into scanf() below. char mode_string[MAX_STRING]; char key_string[MAX_STRING]; char mask_string[MAX_STRING]; @@ -714,7 +715,7 @@ S32 LLViewerKeyboard::loadBindings(const char *filename) if (buffer[0] == '#' || buffer[0] == '\n') continue; // grab the binding strings - tokens_read = sscanf(buffer, "%s %s %s %s", mode_string, key_string, mask_string, function_string); + tokens_read = sscanf(buffer, "%254s %254s %254s %254s", mode_string, key_string, mask_string, function_string); if (tokens_read == EOF) { -- cgit v1.2.3