From: Bob Beck <beck@openssl.org>
Date: Fri, 27 Mar 2026 21:34:16 +0000 (-0600)
Subject: Don't eat a NULL if a queryfile is not provided
X-Git-Tag: openssl-4.0.0~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0423e1910c9466a28f44a18610d9fb4e25ca8264;p=thirdparty%2Fopenssl.git

Don't eat a NULL if a queryfile is not provided

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:53:17 2026
(Merged from https://github.com/openssl/openssl/pull/30608)
---

diff --git a/apps/ts.c b/apps/ts.c
index 6cfac28dda9..f231f16ef9b 100644
--- 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,