mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GPU Calc: Avoid dereferencing null 'score' field in some cases.

Browse Source 
Change-Id: I2e76d19986326b15c088e6dcce1da3be3924d0fc
This commit is contained in:
Michael Meeks
2013-11-28 23:59:50 +00:00
parent 7d3999f2f2
commit 68b2573a60
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sc/source/core/opencl/opencl_device.cxx
View File

@@ -391,19 +391,26 @@ ds_status pickBestDevice(ds_profile* profile, int* bestDeviceIdx)
for (unsigned int d = 0; d < profile->numDevices; d++) for (unsigned int d = 0; d < profile->numDevices; d++)
{ {
ds_device device = profile->devices[d]; ds_device device = profile->devices[d];
LibreOfficeDeviceScore score = *(LibreOfficeDeviceScore*)device.score; LibreOfficeDeviceScore *pScore = (LibreOfficeDeviceScore*)device.score;
float fScore = -1;
if (pScore)
fScore = pScore->fTime;
else
LOG_PRINTF("Unusual null score");
if (DS_DEVICE_OPENCL_DEVICE == device.type) if (DS_DEVICE_OPENCL_DEVICE == device.type)
{ {
LOG_PRINTF("[DS] Device[" << d << "] " << device.oclDeviceName << " (OpenCL) score is " << score.fTime); LOG_PRINTF("[DS] Device[" << d << "] " << device.oclDeviceName << " (OpenCL) score is " << fScore);
} }
else else
{ {
LOG_PRINTF("[DS] Device[" << d << "] CPU (Native) score is " << score.fTime); LOG_PRINTF("[DS] Device[" << d << "] CPU (Native) score is " << fScore);
} }
if (score.fTime < bestScore) if (fScore < bestScore)
{ {
bestScore = score.fTime; bestScore = fScore;
*bestDeviceIdx = d; *bestDeviceIdx = d;
} }
} }