[Mesa-dev] [PATCH mesa 4/6] gallivm: ensure string is null-terminated instead of assert()ing

Eric Engestrom eric.engestrom at intel.com
Fri Sep 21 13:50:39 UTC 2018


Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
---
 src/gallium/auxiliary/gallivm/lp_bld_printf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_printf.c b/src/gallium/auxiliary/gallivm/lp_bld_printf.c
index 575ebdfdf65b7fd43b94..cbfa278728b4ec8f4624 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_printf.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_printf.c
@@ -108,9 +108,7 @@ lp_build_print_value(struct gallivm_state *gallivm,
       type_fmt[5] = '\0';
    } else if (type_kind == LLVMIntegerTypeKind) {
       if (LLVMGetIntTypeWidth(type_ref) == 64) {
-         unsigned flen = strlen(PRId64);
-         assert(flen <= 3);
-         strncpy(type_fmt + 2, PRId64, flen);
+         snprintf(type_fmt + 2, 3, "%s", PRId64);
       } else if (LLVMGetIntTypeWidth(type_ref) == 8) {
          type_fmt[2] = 'u';
       } else {
-- 
Cheers,
  Eric



More information about the mesa-dev mailing list