Ver código fonte

anv: use snprintf() instead of memset()+strcpy()

snprintf() guarantees that it will not write more chars than allowed,
and that the string will be null-terminated, without the need to fill
the whole thing with zeroes to begin with.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
tags/18.3-branchpoint
Eric Engestrom 6 anos atrás
pai
commit
ed5d65a6a1
1 arquivos alterados com 3 adições e 4 exclusões
  1. 3
    4
      src/intel/vulkan/anv_device.c

+ 3
- 4
src/intel/vulkan/anv_device.c Ver arquivo

@@ -37,6 +37,7 @@
#include "util/build_id.h"
#include "util/disk_cache.h"
#include "util/mesa-sha1.h"
#include "util/u_string.h"
#include "git_sha1.h"
#include "vk_util.h"
#include "common/gen_defines.h"
@@ -1135,12 +1136,10 @@ void anv_GetPhysicalDeviceProperties2(
(VkPhysicalDeviceDriverPropertiesKHR *) ext;

driver_props->driverID = VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR;
memset(driver_props->driverName, 0, VK_MAX_DRIVER_NAME_SIZE_KHR);
strcpy(driver_props->driverName,
util_snprintf(driver_props->driverName, VK_MAX_DRIVER_NAME_SIZE_KHR,
"Intel open-source Mesa driver");

memset(driver_props->driverInfo, 0, VK_MAX_DRIVER_INFO_SIZE_KHR);
strcpy(driver_props->driverInfo,
util_snprintf(driver_props->driverInfo, VK_MAX_DRIVER_INFO_SIZE_KHR,
"Mesa " PACKAGE_VERSION MESA_GIT_SHA1);

driver_props->conformanceVersion = (VkConformanceVersionKHR) {

Carregando…
Cancelar
Salvar