summaryrefslogtreecommitdiff
path: root/ext/intl/intl_convert.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-11-03 20:45:13 -0700
committerStanislav Malyshev <stas@php.net>2016-11-03 20:46:25 -0700
commit6e12e49b5be06b4346e3d7802ea9b09f9f1abd7b (patch)
tree4f1594c43a95c5ddd99b28098d60241bd4fff9bd /ext/intl/intl_convert.c
parent7f2b7a4950bf30e6a13e89456275f53e5b66eb1f (diff)
parentea9fac94bbae150a81fde0e6542e6b45965772cd (diff)
downloadphp-git-6e12e49b5be06b4346e3d7802ea9b09f9f1abd7b.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: More string length checks & fixes
Diffstat (limited to 'ext/intl/intl_convert.c')
-rw-r--r--ext/intl/intl_convert.c2
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