Mercurial > vim
diff src/dosinst.c @ 15758:675dd5d7afb3 v8.1.0886
patch 8.1.0886: compiler warning for NULL pointer and condition always true
commit https://github.com/vim/vim/commit/b7633611611eeb5f14f8fd598afa687964e23f23
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 10 21:48:25 2019 +0100
patch 8.1.0886: compiler warning for NULL pointer and condition always true
Problem: Compiler warning for adding to NULL pointer and a condition that
is always true.
Solution: Check for NULL pointer before adding. Remove useless "if".
(Friedirch, closes #3913)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 10 Feb 2019 22:00:07 +0100 |
| parents | 79b56abd37c6 |
| children | e43b5e6d9190 |
line wrap: on
line diff
--- a/src/dosinst.c +++ b/src/dosinst.c @@ -291,16 +291,17 @@ findoldfile(char **destination) { char *bp = *destination; size_t indir_l = strlen(installdir); - char *cp = bp + indir_l; + char *cp; char *tmpname; char *farname; /* * No action needed if exe not found or not in this directory. */ - if (bp == NULL - || strnicmp(bp, installdir, indir_l) != 0 - || strchr("/\\", *cp++) == NULL + if (bp == NULL || strnicmp(bp, installdir, indir_l) != 0) + return; + cp = bp + indir_l; + if (strchr("/\\", *cp++) == NULL || strchr(cp, '\\') != NULL || strchr(cp, '/') != NULL) return;