FPM: refactor fpm_php_get_string_from_table() to better match usage

Pass in length of the key to improve the existance of the key check

Author: Girgias

sapi/fpm/fpm/fpm_php.c

@@ -252,30 +252,28 @@ int fpm_php_limit_extensions(char *path) /* {{{ */
 }
 /* }}} */
 
-char* fpm_php_get_string_from_table(zend_string *table, char *key) /* {{{ */
+bool fpm_php_is_key_in_table(zend_string *table, char *key, size_t key_len) /* {{{ */
 {
-	zval *data, *tmp;
+	zval *data;
 	zend_string *str;
-	if (!table || !key) {
-		return NULL;
-	}
+
+	ZEND_ASSERT(table);
+	ZEND_ASSERT(key);
 
 	/* inspired from ext/standard/info.c */
 
 	zend_is_auto_global(table);
 
 	/* find the table and ensure it's an array */
 	data = zend_hash_find(&EG(symbol_table), table);
-	if (!data || Z_TYPE_P(data) != IS_ARRAY) {
-		return NULL;
-	}
+	ZEND_ASSERT(data && Z_TYPE_P(data) == IS_ARRAY);
 
-	ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(data), str, tmp) {
-		if (str && !strncmp(ZSTR_VAL(str), key, ZSTR_LEN(str))) {
-			return Z_STRVAL_P(tmp);
+	ZEND_HASH_FOREACH_STR_KEY(Z_ARRVAL_P(data), str) {
+		if (str && zend_string_equals_cstr(str, key, key_len)) {
+			return true;
 		}
 	} ZEND_HASH_FOREACH_END();
 
-	return NULL;
+	return false;
 }
 /* }}} */

sapi/fpm/fpm/fpm_php.h

@@ -3,6 +3,7 @@
 #ifndef FPM_PHP_H
 #define FPM_PHP_H 1
 
+#include <stdbool.h>
 #include <TSRM.h>
 
 #include "php.h"
@@ -41,6 +42,6 @@ void fpm_php_soft_quit(void);
 int fpm_php_init_main(void);
 int fpm_php_apply_defines_ex(struct key_value_s *kv, int mode);
 int fpm_php_limit_extensions(char *path);
-char* fpm_php_get_string_from_table(zend_string *table, char *key);
+bool fpm_php_is_key_in_table(zend_string *table, char *key, size_t key_len);
 
 #endif

sapi/fpm/fpm/fpm_status.c

@@ -172,7 +172,7 @@ int fpm_status_handle_request(void) /* {{{ */
 
 		/* full status ? */
 		_GET_str = ZSTR_INIT_LITERAL("_GET", 0);
-		full = (fpm_php_get_string_from_table(_GET_str, "full") != NULL);
+		full = fpm_php_is_key_in_table(_GET_str, "full", strlen("full"));
 		short_syntax = short_post = NULL;
 		full_separator = full_pre = full_syntax = full_post = NULL;
 		encode = 0;
@@ -215,7 +215,7 @@ int fpm_status_handle_request(void) /* {{{ */
 		}
 
 		/* HTML */
-		if (fpm_php_get_string_from_table(_GET_str, "html")) {
+		if (fpm_php_is_key_in_table(_GET_str, "html", strlen("html"))) {
 			sapi_add_header_ex(ZEND_STRL("Content-Type: text/html"), 1, 1);
 			time_format = "%d/%b/%Y:%H:%M:%S %z";
 			encode = 1;
@@ -284,7 +284,7 @@ int fpm_status_handle_request(void) /* {{{ */
 			}
 
 		/* XML */
-		} else if (fpm_php_get_string_from_table(_GET_str, "xml")) {
+		} else if (fpm_php_is_key_in_table(_GET_str, "xml", strlen("xml"))) {
 			sapi_add_header_ex(ZEND_STRL("Content-Type: text/xml"), 1, 1);
 			time_format = "%s";
 			encode = 1;
@@ -332,7 +332,7 @@ int fpm_status_handle_request(void) /* {{{ */
 				}
 
 			/* JSON */
-		} else if (fpm_php_get_string_from_table(_GET_str, "json")) {
+		} else if (fpm_php_is_key_in_table(_GET_str, "json", strlen("json"))) {
 			sapi_add_header_ex(ZEND_STRL("Content-Type: application/json"), 1, 1);
 			time_format = "%s";
 
@@ -379,7 +379,7 @@ int fpm_status_handle_request(void) /* {{{ */
 			}
 
 			/* OpenMetrics */
-		} else if (fpm_php_get_string_from_table(_GET_str, "openmetrics")) {
+		} else if (fpm_php_is_key_in_table(_GET_str, "openmetrics", strlen("openmetrics"))) {
 			sapi_add_header_ex(ZEND_STRL("Content-Type: application/openmetrics-text; version=1.0.0; charset=utf-8"), 1, 1);
 			time_format = "%s";