use correct locale check

diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c
index 404887b383a583420146df3a99eb9e42b5dc58a0..d42b7bcafd81cd84e061d088559ef606f404db8f 100755 (executable)
--- a/ext/intl/collator/collator_create.c
+++ b/ext/intl/collator/collator_create.c
@@ -44,7 +44,7 @@ static void collator_ctor(INTERNAL_FUNCTION_PARAMETERS)
                RETURN_NULL();
        }
 
-       INTL_CHECK_LOCALE_LEN(locale_len);
+       INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
        co = (Collator_object *) zend_object_store_get_object( object TSRMLS_CC );
 
        if(locale_len == 0) {

diff --git a/ext/intl/dateformat/dateformat.c b/ext/intl/dateformat/dateformat.c
index 055066a1b91b84e0009c9472b231adb4c22a6992..e4b71e08bf1aa522ea04e613435449daed9ca220 100755 (executable)
--- a/ext/intl/dateformat/dateformat.c
+++ b/ext/intl/dateformat/dateformat.c
@@ -98,6 +98,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
                RETURN_NULL();
     }
 
+       INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
        DATE_FORMAT_METHOD_FETCH_OBJECT;
        // Convert pattern (if specified) to UTF-16.
        if( pattern_str && pattern_str_len>0 ){

diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c
index 85ea9d3157265712c004a41dd8e6df403ea97c49..d21534b9d891a416a8042733b5826f63fae2e55b 100755 (executable)
--- a/ext/intl/formatter/formatter_main.c
+++ b/ext/intl/formatter/formatter_main.c
@@ -45,7 +45,7 @@ static void numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
                RETURN_NULL();
        }
 
-       INTL_CHECK_LOCALE_LEN(locale_len);
+       INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
        object = return_value;
        FORMATTER_METHOD_FETCH_OBJECT;
 

diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c
index 679beb81ad671665eeaa4c616120a31563006d3a..ba8cef78a7478a99be8f95ef0b7c383f2a96a7f3 100755 (executable)
--- a/ext/intl/msgformat/msgformat.c
+++ b/ext/intl/msgformat/msgformat.c
@@ -48,7 +48,7 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
                RETURN_NULL();
        }
 
-       INTL_CHECK_LOCALE_LEN(locale_len);
+       INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
        MSG_FORMAT_METHOD_FETCH_OBJECT;
 
        // Convert pattern (if specified) to UTF-16.