diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-04-23 15:19:23 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-04-23 15:19:23 -0300 |
| commit | 883d40667d1e71b923aa05b7a4fffc8d98ab9b5e (patch) | |
| tree | 17dcfed3d9f049d4880ceeaead5cb628229ce616 /ext/intl/msgformat/msgformat.c | |
| parent | dd67f066f7079b1384deac4cfd0d9249402da43d (diff) | |
| parent | c8865e3b84c9a3d08811b3b8f954defcd8fb621d (diff) | |
| download | php-git-883d40667d1e71b923aa05b7a4fffc8d98ab9b5e.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)
Diffstat (limited to 'ext/intl/msgformat/msgformat.c')
| -rwxr-xr-x | ext/intl/msgformat/msgformat.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c index b31db9d6ff..84f14de1bd 100755 --- a/ext/intl/msgformat/msgformat.c +++ b/ext/intl/msgformat/msgformat.c @@ -68,6 +68,10 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) INTL_CTOR_CHECK_STATUS(mfo, "msgfmt_create: error converting pattern to quote-friendly format"); } + if ((mfo)->mf_data.orig_format) { + msgformat_data_free(&mfo->mf_data TSRMLS_CC); + } + (mfo)->mf_data.orig_format = estrndup(pattern, pattern_len); (mfo)->mf_data.orig_format_len = pattern_len; |