Re: cvs: php-src(PHP_5_3) /ext/intl/collator collator_create.c /ext/intl/dateformat dateformat.c /ext/intl/formatter formatter_main.c
/ext/intl/msgformat msgformat.c

From: Date: Tue, 22 Jul 2008 21:33:48 +0000
Subject: Re: cvs: php-src(PHP_5_3) /ext/intl/collator collator_create.c /ext/intl/dateformat dateformat.c /ext/intl/formatter formatter_main.c
/ext/intl/msgformat msgformat.c
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-51395@lists.php.net to get a copy of this message
Why aren't you merging this stuff to HEAD? --Jani Stanislav Malyshev kirjoitti:
stas Tue Jul 22 20:40:01 2008 UTC 
  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/intl/collator	collator_create.c     /php-src/ext/intl/dateformat	dateformat.c     /php-src/ext/intl/formatter	formatter_main.c     /php-src/ext/intl/msgformat	msgformat.c   Log:u
use correct locale check http://cvs.php.net/viewvc.cgi/php-src/ext/intl/collator/collator_create.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/intl/collator/collator_create.c diff -u php-src/ext/intl/collator/collator_create.c:1.1.2.2 php-src/ext/intl/collator/collator_create.c:1.1.2.3 --- php-src/ext/intl/collator/collator_create.c:1.1.2.2 Tue Jul 22 20:23:47 2008 +++ php-src/ext/intl/collator/collator_create.c Tue Jul 22 20:40:01 2008 @@ -44,7 +44,7 @@ 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) { http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/intl/dateformat/dateformat.c diff -u php-src/ext/intl/dateformat/dateformat.c:1.1.2.2 php-src/ext/intl/dateformat/dateformat.c:1.1.2.3 --- php-src/ext/intl/dateformat/dateformat.c:1.1.2.2 Tue Jul 22 20:23:47 2008 +++ php-src/ext/intl/dateformat/dateformat.c Tue Jul 22 20:40:01 2008 @@ -98,6 +98,7 @@ 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 ){ http://cvs.php.net/viewvc.cgi/php-src/ext/intl/formatter/formatter_main.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/intl/formatter/formatter_main.c diff -u php-src/ext/intl/formatter/formatter_main.c:1.1.2.2 php-src/ext/intl/formatter/formatter_main.c:1.1.2.3 --- php-src/ext/intl/formatter/formatter_main.c:1.1.2.2 Tue Jul 22 20:23:47 2008 +++ php-src/ext/intl/formatter/formatter_main.c Tue Jul 22 20:40:01 2008 @@ -45,7 +45,7 @@ RETURN_NULL(); } - INTL_CHECK_LOCALE_LEN(locale_len); + INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value); object = return_value; FORMATTER_METHOD_FETCH_OBJECT; http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/intl/msgformat/msgformat.c diff -u php-src/ext/intl/msgformat/msgformat.c:1.1.2.3 php-src/ext/intl/msgformat/msgformat.c:1.1.2.4 --- php-src/ext/intl/msgformat/msgformat.c:1.1.2.3 Tue Jul 22 20:25:51 2008 +++ php-src/ext/intl/msgformat/msgformat.c Tue Jul 22 20:40:01 2008 @@ -48,7 +48,7 @@ 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.


« previous php.cvs (#51395) next »