diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-03 20:45:13 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-03 20:46:25 -0700 |
| commit | 6e12e49b5be06b4346e3d7802ea9b09f9f1abd7b (patch) | |
| tree | 4f1594c43a95c5ddd99b28098d60241bd4fff9bd /ext/intl/msgformat/msgformat_data.c | |
| parent | 7f2b7a4950bf30e6a13e89456275f53e5b66eb1f (diff) | |
| parent | ea9fac94bbae150a81fde0e6542e6b45965772cd (diff) | |
| download | php-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/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); |