ext/standard: Reuse computed strlen() value in getopt()

Girgias · Girgias · commit f3655100b837 · 2024-12-29T18:36:11.000Z
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -1084,13 +1084,13 @@ PHP_FUNCTION(getopt)
 			}
 		} else {
 			/* other strings */
-			if ((args = zend_hash_str_find(Z_ARRVAL_P(return_value), optname, strlen(optname))) != NULL) {
+			if ((args = zend_hash_str_find(Z_ARRVAL_P(return_value), optname, optname_len)) != NULL) {
 				if (Z_TYPE_P(args) != IS_ARRAY) {
 					convert_to_array(args);
 				}
 				zend_hash_next_index_insert(Z_ARRVAL_P(args), &val);
 			} else {
-				zend_hash_str_add(Z_ARRVAL_P(return_value), optname, strlen(optname), &val);
+				zend_hash_str_add(Z_ARRVAL_P(return_value), optname, optname_len, &val);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1084,13 +1084,13 @@ PHP_FUNCTION(getopt)`
`1084`	`1084`	`}`
`1085`	`1085`	`} else {`
`1086`	`1086`	`/* other strings */`
`1087`		`- if ((args = zend_hash_str_find(Z_ARRVAL_P(return_value), optname, strlen(optname))) != NULL) {`
	`1087`	`+ if ((args = zend_hash_str_find(Z_ARRVAL_P(return_value), optname, optname_len)) != NULL) {`
`1088`	`1088`	`if (Z_TYPE_P(args) != IS_ARRAY) {`
`1089`	`1089`	`convert_to_array(args);`
`1090`	`1090`	`}`
`1091`	`1091`	`zend_hash_next_index_insert(Z_ARRVAL_P(args), &val);`
`1092`	`1092`	`} else {`
`1093`		`- zend_hash_str_add(Z_ARRVAL_P(return_value), optname, strlen(optname), &val);`
	`1093`	`+ zend_hash_str_add(Z_ARRVAL_P(return_value), optname, optname_len, &val);`
`1094`	`1094`	`}`
`1095`	`1095`	`}`
`1096`	`1096`