fly/flightgear
1
0
Fork 0
Code Activity

HID-input: fix crash with null manufacturer name

Browse source 
https://sourceforge.net/p/flightgear/codetickets/2041/
This commit is contained in:
James Turner 2018-08-10 15:11:32 +01:00
parent 696c95d612
commit e24134f34a
1 changed files with 8 additions and 4 deletions

12
src/Input/FGHIDEventInput.cxx
View file

@ -315,13 +315,17 @@ FGHIDDevice::FGHIDDevice(hid_device_info *devInfo, FGHIDEventInput *)
{ {
_hidPath = devInfo->path; _hidPath = devInfo->path;
std::wstring manufactuerName = std::wstring(devInfo->manufacturer_string), std::wstring manufactuerName,
productName = std::wstring(devInfo->product_string); productName = std::wstring(devInfo->product_string);
const auto serial = devInfo->serial_number; if (devInfo->manufacturer_string) {
manufactuerName = std::wstring(devInfo->manufacturer_string);
SetName(simgear::strutils::convertWStringToUtf8(manufactuerName) + " " + SetName(simgear::strutils::convertWStringToUtf8(manufactuerName) + " " +
simgear::strutils::convertWStringToUtf8(productName)); simgear::strutils::convertWStringToUtf8(productName));
} else {
SetName(simgear::strutils::convertWStringToUtf8(productName));
}
const auto serial = devInfo->serial_number;
// every device so far encountered returns a blank serial number, so we // every device so far encountered returns a blank serial number, so we
// fall back to the device path to disambiguate. // fall back to the device path to disambiguate.
std::string path(devInfo->path); std::string path(devInfo->path);