diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
| commit | 259fa5fd0b67459145eb5463d79f37271ee7af0a (patch) | |
| tree | 27c7eaddb0c6f7dd406228e3a61fc89b6fedb159 /indra/llcommon/llprocessor.cpp | |
| parent | 80139d95adbcb2258c5541a4e0ace32f32b78ba5 (diff) | |
| parent | a4aed31ad9fd1874b134af87145ec93b283dbbfb (diff) | |
Merge with tip
Diffstat (limited to 'indra/llcommon/llprocessor.cpp')
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 469e544b16..8a4a4a8f9a 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -281,7 +281,8 @@ bool CProcessor::AnalyzeIntelProcessor() // already have a string here from GetCPUInfo(). JC if ( CPUInfo.uiBrandID < LL_ARRAY_SIZE(INTEL_BRAND) ) { - strcpy(CPUInfo.strBrandID, INTEL_BRAND[CPUInfo.uiBrandID]); + strncpy(CPUInfo.strBrandID, INTEL_BRAND[CPUInfo.uiBrandID], sizeof(CPUInfo.strBrandID)-1); + CPUInfo.strBrandID[sizeof(CPUInfo.strBrandID)-1]='\0'; if (CPUInfo.uiBrandID == 3 && CPUInfo.uiModel == 6) { |