diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
| commit | ad94bca0d273869d6358719f4dbd515a905acd26 (patch) | |
| tree | 52ae9f056f3dd6a938434d45d5295aef87e77e0a /indra/newview/llviewerkeyboard.cpp | |
| parent | 787ac69d75dbbd8ad79c32a5de54603351523eae (diff) | |
merge -r 56696:57082 Branch_1-13-2
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |