From b7633611611eeb5f14f8fd598afa687964e23f23 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 10 Feb 2019 21:48:25 +0100 Subject: 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) --- src/dosinst.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/dosinst.c') diff --git a/src/dosinst.c b/src/dosinst.c index 5b05598872..7025eb6184 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; -- cgit v1.2.3