diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-10 21:48:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-10 21:48:25 +0100 |
| commit | b7633611611eeb5f14f8fd598afa687964e23f23 (patch) | |
| tree | fa9dff5fb75eb6d62d3c3fc9cd9a0c0d05c3b83d /src/dosinst.c | |
| parent | 18c5632cab09e5e51320f55005f310920648f35b (diff) | |
| download | vim-git-b7633611611eeb5f14f8fd598afa687964e23f23.tar.gz | |
patch 8.1.0886: compiler warning for NULL pointer and condition always truev8.1.0886
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)
Diffstat (limited to 'src/dosinst.c')
| -rw-r--r-- | src/dosinst.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/dosinst.c b/src/dosinst.c index 5b0559887..7025eb618 100644 --- 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; |