diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-04-30 15:23:06 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-04-30 15:23:06 +0300 |
| commit | 47bb094b4760133628ad41cd65eb272eeae6f295 (patch) | |
| tree | 82d575de0d1e90cd22946756809373efcc4e5437 /indra/newview | |
| parent | 89cfffa15f071d4dd4f5ba31630d09ea4ad6fded (diff) | |
SL-10565 LLMachineID crashes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmachineid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index 2001359e50..c667b0af3f 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -224,11 +224,11 @@ S32 LLMachineID::init() unsigned int serial_size = SysStringLen(serialNumber); unsigned int j = 0; - while (j < serial_size) + while (j < serial_size && vtProp.bstrVal[j] != 0) { for (unsigned int i = 0; i < len; i++) { - if (j >= serial_size) + if (j >= serial_size || vtProp.bstrVal[j] == 0) break; static_unique_id[i] = (unsigned int)(static_unique_id[i] + serialNumber[j]); |