[Bf-blender-cvs] [9539cfacca8] master: Cycles: Apparently board name could be an empty string

[Sergey Sharybin]

Commit: 9539cfacca8ca2aeda1ff48113b6db872ff38eed
Author: Sergey Sharybin
Date:   Mon Apr 10 15:31:21 2017 +0200
Branches: master
https://developer.blender.org/rB9539cfacca8ca2aeda1ff48113b6db872ff38eed

Cycles: Apparently board name could be an empty string

===================================================================

M	intern/cycles/device/opencl/opencl_util.cpp

===================================================================

diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp
index 6dca642f3f3..fe1c65a2224 100644
--- a/intern/cycles/device/opencl/opencl_util.cpp
+++ b/intern/cycles/device/opencl/opencl_util.cpp
@@ -1058,13 +1058,16 @@ cl_device_type OpenCLInfo::get_device_type(cl_device_id device_id)
 string OpenCLInfo::get_readable_device_name(cl_device_id device_id)
 {
 	char board_name[1024];
+	size_t length = 0;
 	if(clGetDeviceInfo(device_id,
 	                   CL_DEVICE_BOARD_NAME_AMD,
 	                   sizeof(board_name),
 	                   &board_name,
-	                   NULL) == CL_SUCCESS)
+					   &length) == CL_SUCCESS)
 	{
-		return board_name;
+		if(length != 0 && board_name[0] != '\0') {
+			return board_name;
+		}
 	}
 	/* Fallback to standard device name API. */
 	return get_device_name(device_id);