From: David Carlier <devnexen@gmail.com>
Date: Sat, 13 Feb 2021 10:26:43 +0000 (+0000)
Subject: Avoid repeatedly calling strlen in FPM setproctitle implementation
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe01a7c515ba940155c9303ecfa4ad06fc4e2219;p=php

Avoid repeatedly calling strlen in FPM setproctitle implementation

Closes GH-6689.
---

diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c
index 9931ab480c..e9a59d2daa 100644
--- a/sapi/fpm/fpm/fpm_env.c
+++ b/sapi/fpm/fpm/fpm_env.c
@@ -124,10 +124,11 @@ void fpm_env_setproctitle(char *title) /* {{{ */
 	setproctitle("%s", title);
 #else
 #ifdef __linux__
-	if (fpm_env_argv != NULL && fpm_env_argv_len > strlen(SETPROCTITLE_PREFIX) + 3) {
+	size_t prefixlen = strlen(SETPROCTITLE_PREFIX);
+	if (fpm_env_argv != NULL && fpm_env_argv_len > prefixlen + 3) {
 		memset(fpm_env_argv[0], 0, fpm_env_argv_len);
 		strncpy(fpm_env_argv[0], SETPROCTITLE_PREFIX, fpm_env_argv_len - 2);
-		strncpy(fpm_env_argv[0] + strlen(SETPROCTITLE_PREFIX), title, fpm_env_argv_len - strlen(SETPROCTITLE_PREFIX) - 2);
+		strncpy(fpm_env_argv[0] + prefixlen, title, fpm_env_argv_len - prefixlen - 2);
 		fpm_env_argv[1] = NULL;
 	}
 #endif