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/msgformat/msgformat_data.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/msgformat/msgformat_data.c')
| -rw-r--r-- | ext/intl/msgformat/msgformat_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/msgformat/msgformat_data.c b/ext/intl/msgformat/msgformat_data.c index b35c7c2281..e2510e16b8 100644 --- a/ext/intl/msgformat/msgformat_data.c +++ b/ext/intl/msgformat/msgformat_data.c @@ -83,7 +83,7 @@ msgformat_data* msgformat_data_create( void ) int msgformat_fix_quotes(UChar **spattern, uint32_t *spattern_len, UErrorCode *ec) { if(*spattern && *spattern_len && u_strchr(*spattern, (UChar)'\'')) { - UChar *npattern = emalloc(sizeof(UChar)*(2*(*spattern_len)+1)); + UChar *npattern = safe_emalloc(sizeof(UChar)*2, *spattern_len, sizeof(UChar)); uint32_t npattern_len; npattern_len = umsg_autoQuoteApostrophe(*spattern, *spattern_len, npattern, 2*(*spattern_len)+1, ec); efree(*spattern); |