diff options
author | Stanislav Malyshev <stas@php.net> | 2016-11-03 22:53:05 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2016-11-03 22:53:05 -0700 |
commit | 25d04ad8e3e4b415645f982178a274f7a36eeef6 (patch) | |
tree | 9a6bf6839715f09d5b609f2e0cac986f143aa038 /ext/intl/intl_convert.c | |
parent | 0bc6592307af27c81ab1717cc589adb2530565ac (diff) | |
parent | d858b4c77fa28ff9b0a597141a58f51803bafc2b (diff) | |
download | php-git-25d04ad8e3e4b415645f982178a274f7a36eeef6.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add length check for bzcompress too - fix for bug #73356
More string length checks & fixes
More string length checks & fixes
Diffstat (limited to 'ext/intl/intl_convert.c')
-rw-r--r-- | ext/intl/intl_convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/intl_convert.c b/ext/intl/intl_convert.c index 2ae43fbb96..5092b7594f 100644 --- a/ext/intl/intl_convert.c +++ b/ext/intl/intl_convert.c @@ -53,7 +53,7 @@ void intl_convert_utf8_to_utf16( UErrorCode* status ) { UChar* dst_buf = NULL; - int32_t dst_len = 0; + uint32_t dst_len = 0; /* If *target is NULL determine required destination buffer size (pre-flighting). * Otherwise, attempt to convert source string; if *target buffer is not large enough |