← Back to branch summary

~legolas/ubuntu/natty/php5/5.3.5

« back to all changes in this revision

Viewing changes to ext/intl/formatter/formatter_attr.c

  • Committer: Stas Verberkt
  • Date: 2011-02-01 09:27:15 UTC
  • Revision ID: legolas@legolasweb.nl-20110201092715-yq052iu2yl4i2eyg
Inserted PHP 5.3.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/intl/formatter/formatter_attr.c
250
250
        long symbol;
251
251
        UChar value_buf[4];
252
252
        UChar *value = value_buf;
253
 
        int length = USIZE(value);
 
253
        int length = USIZE(value_buf);
254
254
        FORMATTER_METHOD_INIT_VARS;
255
255
 
256
256
        /* Parse parameters. */
262
262
 
263
263
                RETURN_FALSE;
264
264
        }
 
265
        
 
266
        if(symbol >= UNUM_FORMAT_SYMBOL_COUNT || symbol < 0) {
 
267
                intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "numfmt_get_symbol: invalid symbol value", 0 TSRMLS_CC );
 
268
                RETURN_FALSE;
 
269
        }
265
270
 
266
271
        /* Fetch the object. */
267
272
        FORMATTER_METHOD_FETCH_OBJECT;
268
273
 
269
274
        length = unum_getSymbol(FORMATTER_OBJECT(nfo), symbol, value_buf, length, &INTL_DATA_ERROR_CODE(nfo));
270
 
        if(INTL_DATA_ERROR_CODE(nfo) == U_BUFFER_OVERFLOW_ERROR && length >= USIZE( value )) {
 
275
        if(INTL_DATA_ERROR_CODE(nfo) == U_BUFFER_OVERFLOW_ERROR && length >= USIZE( value_buf )) {
271
276
                ++length; /* to avoid U_STRING_NOT_TERMINATED_WARNING */
272
277
                INTL_DATA_ERROR_CODE(nfo) = U_ZERO_ERROR;
273
278
                value = eumalloc(length);