com php-src: more param parsing fixes, overseen stuff: ext/intl/calendar/gregoriancalendar_methods.cpp ext/intl/ normalizer/normalizer_normalize.c
ext/intl/timezone/timez one_methods.cpp

From: Date: Tue, 26 Nov 2013 20:13:14 +0000
Subject: com php-src: more param parsing fixes, overseen stuff: ext/intl/calendar/gregoriancalendar_methods.cpp ext/intl/ normalizer/normalizer_normalize.c
ext/intl/timezone/timez one_methods.cpp
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74072@lists.php.net to get a copy of this message
Commit: 358fae9347396dd220fc1484fbbcec79c47aa225 Author: Anatol Belski <ab@php.net> Tue, 26 Nov 2013 21:12:20 +0100 Parents: 54797a9b1551f3af443f4d1e89bb89796bdbc097 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=358fae9347396dd220fc1484fbbcec79c47aa225 Log: more param parsing fixes, overseen stuff Changed paths: M ext/intl/calendar/gregoriancalendar_methods.cpp M ext/intl/normalizer/normalizer_normalize.c M ext/intl/timezone/timezone_methods.cpp Diff: diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index 62473eb..1d0c110 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -75,7 +75,7 @@ static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS) } } if (variant > 2 && zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, - "lll|lll", &largs[0], &largs[1], &largs[2], &largs[3], &largs[4], + "iii|iii", &largs[0], &largs[1], &largs[2], &largs[3], &largs[4], &largs[5]) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlgregcal_create_instance: bad arguments", 0 TSRMLS_CC); diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index 23c27cf..7736cb1 100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize..c @@ -53,7 +53,7 @@ PHP_FUNCTION( normalizer_normalize ) intl_error_reset( NULL TSRMLS_CC ); /* Parse parameters. */ - if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|l", + if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|i", &input, &input_len, &form ) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, @@ -184,7 +184,7 @@ PHP_FUNCTION( normalizer_is_normalized ) intl_error_reset( NULL TSRMLS_CC ); /* Parse parameters. */ - if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|l", + if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|i", &input, &input_len, &form) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp index 6d410a2..573bd8c 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -541,7 +541,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name) TIMEZONE_METHOD_INIT_VARS; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), - "O|blS!", &object, TimeZone_ce_ptr, &daylight, &display_type, + "O|biS!", &object, TimeZone_ce_ptr, &daylight, &display_type, &locale_str, &dummy) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intltz_get_display_name: bad arguments", 0 TSRMLS_CC);

« previous php.cvs (#74072) next »