From: Richard Levitte <levitte@openssl.org>
Date: Fri, 20 Apr 2018 10:27:14 +0000 (+0200)
Subject: Better check of return values from app_isdir and app_access
X-Git-Tag: OpenSSL_1_1_1-pre6~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c36e9093914aab4bfc42af1db35558a9272607b5;p=oweals%2Fopenssl.git

Better check of return values from app_isdir and app_access

[extended tests]

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6033)
---

diff --git a/apps/opt.c b/apps/opt.c
index a9d163a480..4d06983241 100644
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -676,13 +676,13 @@ int opt_next(void)
             /* Just a string. */
             break;
         case '/':
-            if (app_isdir(arg) >= 0)
+            if (app_isdir(arg) > 0)
                 break;
             BIO_printf(bio_err, "%s: Not a directory: %s\n", prog, arg);
             return -1;
         case '<':
             /* Input file. */
-            if (strcmp(arg, "-") == 0 || app_access(arg, R_OK) >= 0)
+            if (strcmp(arg, "-") == 0 || app_access(arg, R_OK) == 0)
                 break;
             BIO_printf(bio_err,
                        "%s: Cannot open input file %s, %s\n",
@@ -690,7 +690,7 @@ int opt_next(void)
             return -1;
         case '>':
             /* Output file. */
-            if (strcmp(arg, "-") == 0 || app_access(arg, W_OK) >= 0 || errno == ENOENT)
+            if (strcmp(arg, "-") == 0 || app_access(arg, W_OK) == 0 || errno == ENOENT)
                 break;
             BIO_printf(bio_err,
                        "%s: Cannot open output file %s, %s\n",