]> granicus.if.org Git - php/commitdiff
Fix handling of several uinitialized intl objects
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 21 Aug 2012 21:21:59 +0000 (23:21 +0200)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Wed, 22 Aug 2012 20:54:43 +0000 (22:54 +0200)
Master specific changes. Not having this in the merge commit helps
porting to pecl/intl

ext/intl/dateformat/dateformat_create.cpp

index 7fefbe7449c675a369cb199fc086532f044ccd55..a2899f79746186aad175787517ccc4cc174b084a 100644 (file)
@@ -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,