From f9c4314d3551897fcbe683f039be523d0749a0cd Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 26 May 2020 16:09:03 -0700 Subject: [PATCH] freedreno: Add missing va_end. Fix warning reported by Coverity Scan. Missing varargs init or cleanup (VARARGS) missing_va_end: va_end was not called for ap. Fixes: a0ca1462f317 ("freedreno: add logging infrastructure") Signed-off-by: Vinson Lee Part-of: (cherry picked from commit 755c0400606f821111fec76764ddb97243f2ad8f) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/freedreno_log.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e20ea3c314d..9da89662518 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -76,7 +76,7 @@ "description": "freedreno: Add missing va_end.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "a0ca1462f31747d028abe9106309f6c95c3daabf" }, diff --git a/src/gallium/drivers/freedreno/freedreno_log.c b/src/gallium/drivers/freedreno/freedreno_log.c index 8970e40189e..ad4c49eb2ec 100644 --- a/src/gallium/drivers/freedreno/freedreno_log.c +++ b/src/gallium/drivers/freedreno/freedreno_log.c @@ -215,8 +215,10 @@ _fd_log(struct fd_batch *batch, const char *fmt, ...) va_list ap; va_start(ap, fmt); - if (vasprintf(&msg, fmt, ap) < 0) + if (vasprintf(&msg, fmt, ap) < 0) { + va_end(ap); return; + } va_end(ap); u_fifo_add(chunk->msg_fifo, msg);