From 3294d654166ec26cac58037a0358b9f7ea75b2d6 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Fri, 10 Nov 2023 17:48:45 +0100
Subject: [PATCH] PVS fixes

* build(PVS): exclude mpack and klib as they are external dependencies

* build(PVS): suppress warning V601

See https://pvs-studio.com/en/docs/warnings/v601/

* fix(PVS/V009): add top-level message

* fix(PVS/V547): expression 'p != NULL' is always true

* fix(PVS/V547): expression '* termpp == NULL' is always false
---
 scripts/pvscheck.sh  | 4 +++-
 src/nvim/base64.c    | 3 +++
 src/nvim/cmdexpand.c | 6 ++----
 src/nvim/terminal.c  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 81f309aeb3..5334dd2fb7 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -374,6 +374,8 @@ run_analysis() {(
       --lic-file PVS-Studio.lic \
       --threads "$(get_jobs_num)" \
       --exclude-path src/cjson \
+      --exclude-path src/klib \
+      --exclude-path src/mpack \
       --exclude-path src/xdiff \
       --exclude-path build \
       --output-file PVS-studio.log \
@@ -381,7 +383,7 @@ run_analysis() {(
       --sourcetree-root . || true
 
   rm -rf PVS-studio.{xml,err,tsk,html.d}
-  local plog_args="PVS-studio.log --srcRoot . --excludedCodes V002,V011,V1028,V1042,V1051,V1074"
+  local plog_args="PVS-studio.log --srcRoot . --excludedCodes V002,V011,V601,V1028,V1042,V1051,V1074"
   plog-converter $plog_args --renderTypes xml       --output PVS-studio.xml
   plog-converter $plog_args --renderTypes errorfile --output PVS-studio.err
   plog-converter $plog_args --renderTypes tasklist  --output PVS-studio.tsk
diff --git a/src/nvim/base64.c b/src/nvim/base64.c
index c647019fb1..f004e4fe8b 100644
--- a/src/nvim/base64.c
+++ b/src/nvim/base64.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c
index 6b83664339..51675b81bc 100644
--- a/src/nvim/cmdexpand.c
+++ b/src/nvim/cmdexpand.c
@@ -169,10 +169,8 @@ static void wildescape(expand_T *xp, const char *str, int numfiles, char **files
       } else if (xp->xp_backslash & XP_BS_COMMA) {
         if (vim_strchr(files[i], ',') != NULL) {
           p = vim_strsave_escaped(files[i], ",");
-          if (p != NULL) {
-            xfree(files[i]);
-            files[i] = p;
-          }
+          xfree(files[i]);
+          files[i] = p;
         }
       }
 #ifdef BACKSLASH_IN_FILENAME
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index a4ae8d2ae2..465d1d0cbc 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -259,7 +259,7 @@ void terminal_open(Terminal **termpp, buf_T *buf, TerminalOptions opts)
 
   aucmd_restbuf(&aco);
 
-  if (*termpp == NULL) {
+  if (*termpp == NULL) {  // -V547
     return;  // Terminal has already been destroyed.
   }