[Mesa-dev] [PATCH mesa] anv: use snprintf() instead of memset()+strcpy()

Lionel Landwerlin lionel.g.landwerlin at intel.com
Tue Oct 23 15:18:18 UTC 2018


Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

On 23/10/2018 15:31, Eric Engestrom wrote:
> 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 at intel.com>
> ---
>   src/intel/vulkan/anv_device.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
> index c009176dcc6c605e2e41..3ac1bad93ed8713b0da5 100644
> --- a/src/intel/vulkan/anv_device.c
> +++ b/src/intel/vulkan/anv_device.c
> @@ -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) {




More information about the mesa-dev mailing list