summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorDavid Carlier <devnexen@gmail.com>2021-02-13 10:26:43 +0000
committerNikita Popov <nikita.ppv@gmail.com>2021-02-15 11:29:18 +0100
commitfe01a7c515ba940155c9303ecfa4ad06fc4e2219 (patch)
tree28e7dc4e3b38345f506bf1da8074cb59e56ce56e /sapi
parent549235d32738b79ec32de52a0daba875f71a97f6 (diff)
downloadphp-git-fe01a7c515ba940155c9303ecfa4ad06fc4e2219.tar.gz
Avoid repeatedly calling strlen in FPM setproctitle implementation
Closes GH-6689.
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/fpm/fpm_env.c5
1 files changed, 3 insertions, 2 deletions
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