From: Antony Dovgal Date: Fri, 13 Jul 2007 15:52:38 +0000 (+0000) Subject: fix %u in Unicode mode X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~128 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c601b252a0072e9e47d14651b83195fe8ae1b6bd;p=php fix %u in Unicode mode --- diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 000457ab83..41b67d0504 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -308,7 +308,7 @@ php_u_sprintf_appenduint(UChar **buffer, int *pos, int *size, register unsigned long magn, nmagn; register unsigned int i = NUM_BUF_SIZE - 1; - magn = (unsigned int) number; + magn = (unsigned long) number; /* Can't right-pad 0's on integers */ if (alignment == 0 && padding == 0x30 /* '0' */) padding = 0x20 /* ' ' */; diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt index 0f151c9753..b314ecceea 100644 --- a/ext/standard/tests/array/bug35014_64bit.phpt +++ b/ext/standard/tests/array/bug35014_64bit.phpt @@ -31,8 +31,8 @@ int(3) int(9) float(1) int(9999999800000001) -float(2.8404260053903E+20) -int(8589934590) +float(1.219953680145E+30) +float(3.6893488147419E+19) --UEXPECTF-- Warning: array_product() expects parameter 1 to be array, Unicode string given in %s on line %d NULL