Merge #8419 'Fix PVS warnings'

3 files changed, 3 insertions, 2 deletions

diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c
index 6f45b09fce..6fcb9f7e7a 100644
--- a/src/nvim/event/socket.c
+++ b/src/nvim/event/socket.c
@@ -252,7 +252,7 @@ tcp_retry:
   }
   status = 1;
   LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, timeout, status != 1);
-  if (status == 0) {
+  if (status == 0) {  // -V547
     stream_init(NULL, stream, -1, uv_stream);
     success = true;
   } else if (is_tcp && addrinfo->ai_next) {
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 07a65c2611..9a2ecbfbd8 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1854,6 +1854,7 @@ static int vgetorpeek(int advance)
                     }
                   } else if (keylen > mp_match_len
                              || (keylen == mp_match_len
+                                 && mp_match != NULL
                                  && (mp_match->m_mode & LANGMAP) == 0
                                  && (mp->m_mode & LANGMAP) != 0)) {
                     // found a longer match
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index b3a0e4816b..52677738e8 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -1253,11 +1253,11 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap,
               }
 
               // Cast to char to avoid a conversion warning on Ubuntu 12.04.
+              assert(l + 1 < sizeof(format));
               format[l] = (char)(fmt_spec == 'F' ? 'f' : fmt_spec);
               format[l + 1] = NUL;
 
               // Regular float number
-              assert(l + 1 < sizeof(format));
               str_arg_l = (size_t)snprintf(tmp, sizeof(tmp), format, f);
               assert(str_arg_l < sizeof(tmp));