diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-04-30 15:24:49 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-04-30 15:24:49 +0300 |
| commit | 3961a9e80a5c46d969f34775483f0e7aa0dfb84c (patch) | |
| tree | e406bb650ceb311d3f0ba6372562c791121dfb83 /indra | |
| parent | 47bb094b4760133628ad41cd65eb272eeae6f295 (diff) | |
SL-11061 Viewer crashes on launch if serial is either unset or does not return a string
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llmachineid.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index c667b0af3f..51127928d1 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -217,6 +217,13 @@ S32 LLMachineID::init() // Get the value of the Name property hr = pclsObj->Get(L"SerialNumber", 0, &vtProp, 0, 0); + if (FAILED(hr)) + { + LL_WARNS() << "Failed to get SerialNumber. Error code = 0x" << hex << hres << LL_ENDL; + pclsObj->Release(); + pclsObj = NULL; + continue; + } LL_INFOS("AppInit") << " Serial Number : " << vtProp.bstrVal << LL_ENDL; // use characters in the returned Serial Number to create a byte array of size len |