]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Don't eat a NULL if a queryfile is not provided
authorBob Beck <beck@openssl.org>
Fri, 27 Mar 2026 21:34:16 +0000 (15:34 -0600)
committerNorbert Pocs <norbertp@openssl.org>
Tue, 31 Mar 2026 09:47:38 +0000 (11:47 +0200)
Fixes: 18cd23df8a8f2 "Remove "noise" comments from TS files."
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Tue Mar 31 09:51:38 2026
(Merged from https://github.com/openssl/openssl/pull/30608)

apps/ts.c

index 6cfac28dda9b86eea6376770230cb99e7ebac7b6..f231f16ef9bd1653a5eb50c1ddadfa500cd57694 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -339,7 +339,7 @@ int ts_main(int argc, char **argv)
         if ((in != NULL) && (queryfile != NULL))
             goto opthelp;
         if (in == NULL) {
-            if ((conf == NULL) || (token_in != 0))
+            if (conf == NULL || token_in != 0 || queryfile == NULL)
                 goto opthelp;
         }
         ret = !reply_command(conf, section, queryfile,