From: Anatol Belski <ab@php.net>
Date: Wed, 12 Oct 2016 11:28:23 +0000 (+0200)
Subject: avoid strlen
X-Git-Tag: php-7.1.0RC4~21^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaa5d07365b54f35ba3b5024492450f3d2fe4ee5;p=php

avoid strlen
---

diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index e2caacf9e9..eaf113a97e 100644
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -407,7 +407,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS)
 		loc_name = intl_locale_get_default();
 	}
 	
-	INTL_CHECK_LOCALE_LEN(strlen(loc_name));
+	INTL_CHECK_LOCALE_LEN(loc_name_len);
 
 	/* Call ICU get */
 	tag_value = get_icu_value_internal( loc_name , tag_name , &result ,0);
@@ -1171,7 +1171,7 @@ PHP_FUNCTION(locale_get_all_variants)
 		loc_name = intl_locale_get_default();
 	}
 
-	INTL_CHECK_LOCALE_LEN(strlen(loc_name));
+	INTL_CHECK_LOCALE_LEN(loc_name_len);
 
 	array_init( return_value );
 
@@ -1280,8 +1280,8 @@ PHP_FUNCTION(locale_filter_matches)
 		RETURN_TRUE;
 	}
 
-	INTL_CHECK_LOCALE_LEN(strlen(loc_range));
-	INTL_CHECK_LOCALE_LEN(strlen(lang_tag));
+	INTL_CHECK_LOCALE_LEN(loc_range_len);
+	INTL_CHECK_LOCALE_LEN(lang_tag_len);
 
 	if( boolCanonical ){
 		/* canonicalize loc_range */
@@ -1564,7 +1564,7 @@ PHP_FUNCTION(locale_lookup)
 
 	hash_arr = Z_ARRVAL_P(arr);
 
-	INTL_CHECK_LOCALE_LEN(strlen(loc_range));
+	INTL_CHECK_LOCALE_LEN(loc_range_len);
 
 	if( !hash_arr || zend_hash_num_elements( hash_arr ) == 0 ) {
 		RETURN_EMPTY_STRING();