diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-29 20:10:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-18 11:37:55 +0000 |
| commit | 853df7a5fa2b48f62a350c0e9eb1be3f6014dedc (patch) | |
| tree | a047b58e87f0a5c47567004025f1f1a17a3053f4 | |
| parent | 12dc5807c7b459da501f6bbbe107575fe26b9a05 (diff) | |
backport of opencl coverity fixes
includes:
coverity#1358843 Argument cannot be negative
77327a03904ad7d6f58b07ec698cd15f02a4d6fa
coverity#1358844 Uninitialized pointer field
478a4032da69654245d478e15902feda1e49c84c
Change-Id: I1a978106d2909169c5d10755ae88a69889d86274
Reviewed-on: https://gerrit.libreoffice.org/24913
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | opencl/inc/opencl_device_selection.h | 3 | ||||
| -rw-r--r-- | opencl/source/opencl_device.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h index 6ec506dd0314..e2bda73af8f3 100644 --- a/opencl/inc/opencl_device_selection.h +++ b/opencl/inc/opencl_device_selection.h @@ -326,6 +326,9 @@ private: public: XmlWalker() + : mpDocPtr(nullptr) + , mpRoot(nullptr) + , mpCurrent(nullptr) {} ~XmlWalker() diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx index d70ea8180199..2acecdf25754 100644 --- a/opencl/source/opencl_device.cxx +++ b/opencl/source/opencl_device.cxx @@ -434,7 +434,7 @@ ds_status pickBestDevice(std::unique_ptr<ds_profile>& profile, int& rBestDeviceI rBestDeviceIndex = d; } } - if (profile->devices[rBestDeviceIndex].eType == DeviceType::OpenCLDevice) + if (rBestDeviceIndex != -1 && profile->devices[rBestDeviceIndex].eType == DeviceType::OpenCLDevice) { SAL_INFO("opencl.device", "Selected Device[" << rBestDeviceIndex << "]: " << profile->devices[rBestDeviceIndex].sDeviceName << "(OpenCL)."); } |