diff options
| author | Nikita Popov <nikic@php.net> | 2015-04-17 10:26:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-04-17 10:33:59 +0200 |
| commit | e74b84a9fe36791e514454148e622f56815ac925 (patch) | |
| tree | 68523eff47de3c63eb975b08c6781a29bcdb72df /ext/intl/breakiterator | |
| parent | 25affa8a0f219e34fac911b869194aa7515e91e4 (diff) | |
| download | php-git-e74b84a9fe36791e514454148e622f56815ac925.tar.gz | |
Fix Intl constructor leaks
Drop the Z_OBJ(return_value) = NULL hack and return status code
from ctor function instead.
Diffstat (limited to 'ext/intl/breakiterator')
| -rw-r--r-- | ext/intl/breakiterator/breakiterator_methods.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index baab5a682d..ce855ebacd 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -162,11 +162,11 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text) BREAKITER_METHOD_FETCH_OBJECT; ut = utext_openUTF8(ut, text->val, text->len, BREAKITER_ERROR_CODE_P(bio)); - INTL_CTOR_CHECK_STATUS(bio, "breakiter_set_text: error opening UText"); + INTL_METHOD_CHECK_STATUS_OR_NULL(bio, "breakiter_set_text: error opening UText"); bio->biter->setText(ut, BREAKITER_ERROR_CODE(bio)); utext_close(ut); /* ICU shallow clones the UText */ - INTL_CTOR_CHECK_STATUS(bio, "breakiter_set_text: error calling " + INTL_METHOD_CHECK_STATUS_OR_NULL(bio, "breakiter_set_text: error calling " "BreakIterator::setText()"); /* When ICU clones the UText, it does not copy the buffer, so we have to |