com php-src: Fix handling of several uinitialized intl objects: ext/intl/dateformat/dateformat_create.cpp
| From: | Gustavo André dos Santos Lopes | Date: | Wed, 22 Aug 2012 20:54:43 +0000 |
| Subject: | com php-src: Fix handling of several uinitialized intl objects: ext/intl/dateformat/dateformat_create.cpp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69930@lists.php.net to get a copy of this message | ||
Commit: b9eae3d67c10ccaf83e85e36777704f276f0ffae
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Tue, 21 Aug 2012 23:21:59 +0200
Parents: fcd4420dbf51b8d343894bb852556cc2ccc462e3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b9eae3d67c10ccaf83e85e36777704f276f0ffae
Log:
Fix handling of several uinitialized intl objects
Master specific changes. Not having this in the merge commit helps
porting to pecl/intl
Changed paths:
M ext/intl/dateformat/dateformat_create.cpp
Diff:
diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp
index 7fefbe7..a2899f7 100644
--- a/ext/intl/dateformat/dateformat_create.cpp
+++ b/ext/intl/dateformat/dateformat_create.cpp
@@ -76,7 +76,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
}
locale = Locale::createFromName(locale_str);
- DATE_FORMAT_METHOD_FETCH_OBJECT;
+ DATE_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK;
if (DATE_FORMAT_OBJECT(dfo) != NULL) {
intl_errors_set(INTL_DATA_ERROR_P(dfo), U_ILLEGAL_ARGUMENT_ERROR,