]> granicus.if.org Git - php/commitdiff
Avoid repeatedly calling strlen in FPM setproctitle implementation
authorDavid Carlier <devnexen@gmail.com>
Sat, 13 Feb 2021 10:26:43 +0000 (10:26 +0000)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 15 Feb 2021 10:29:18 +0000 (11:29 +0100)
Closes GH-6689.

sapi/fpm/fpm/fpm_env.c

index 9931ab480cf608b9ef012907f115cb65006716e5..e9a59d2daa0b5b5ef03470ef67b75facf8cdfb69 100644 (file)
@@ -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