From: Matt Caswell <matt@openssl.org>
Date: Fri, 21 Apr 2023 09:17:11 +0000 (+0100)
Subject: Replace use of strstr with strchr
X-Git-Tag: openssl-3.2.0-alpha1~977
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a80840c663e3409203b0235764e53d8624f74cb8;p=thirdparty%2Fopenssl.git

Replace use of strstr with strchr

It is better to use strchr where we are looking for a single character.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20788)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index c69b8e40581..d6fd124da8a 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -3828,7 +3828,7 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
 
         cmd_start[outlen] = '\0';
         for (;;) {
-            cmd_start = strstr(cmd_start, "{");
+            cmd_start = strchr(cmd_start, '{');
             if (cmd_start == buf_start && *(cmd_start + 1) == '{') {
                 /* The "{" is escaped, so skip it */
                 cmd_start += 2;
@@ -3843,7 +3843,7 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
 
         if (cmd_start == buf_start) {
             /* Command detected */
-            char *cmd_end = strstr(cmd_start, "}");
+            char *cmd_end = strchr(cmd_start, '}');
             char *arg_start;
             int cmd = -1, ret = USER_DATA_PROCESS_NO_DATA;
             size_t oldoff;
@@ -3858,7 +3858,7 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
                 return USER_DATA_PROCESS_NO_DATA;
             }
             *cmd_end = '\0';
-            arg_start = strstr(cmd_start, ":");
+            arg_start = strchr(cmd_start, ':');
             if (arg_start != NULL) {
                 *arg_start = '\0';
                 arg_start++;