From 47bb094b4760133628ad41cd65eb272eeae6f295 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 30 Apr 2019 15:23:06 +0300 Subject: SL-10565 LLMachineID crashes --- indra/newview/llmachineid.cpp | 4 ++-- 1 file 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]); -- cgit v1.2.3