com php-src: Fix leak in IntlCalendar::fromDateTime(): ext/intl/calendar/calendar_methods.cpp

From: Date: Fri, 17 Apr 2015 07:28:36 +0000
Subject: com php-src: Fix leak in IntlCalendar::fromDateTime(): ext/intl/calendar/calendar_methods.cpp
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86345@lists.php.net to get a copy of this message
Commit: 4e2be45309f02ff1fa7305d33d45e64d773d1b24 Author: Nikita Popov <nikic@php.net> Thu, 16 Apr 2015 21:43:19 +0200 Parents: 276080ec3a6977f24c55603e1ae152ba7bbf486a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e2be45309f02ff1fa7305d33d45e64d773d1b24 Log: Fix leak in IntlCalendar::fromDateTime() Changed paths: M ext/intl/calendar/calendar_methods.cpp Diff: diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp index c8acf5f..ac5b33a 100644 --- a/ext/intl/calendar/calendar_methods.cpp +++ b/ext/intl/calendar/calendar_methods.cpp @@ -1161,11 +1161,11 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time) Z_OBJCE_P(zv_arg), php_date_get_date_ce()))) { object_init_ex(&zv_tmp, php_date_get_date_ce()); zend_call_method_with_1_params(&zv_tmp, NULL, NULL, "__construct", NULL, zv_arg); + zv_datetime = &zv_tmp; if (EG(exception)) { zend_object_store_ctor_failed(Z_OBJ(zv_tmp)); goto error; } - zv_datetime = &zv_tmp; } else { zv_datetime = zv_arg; }

« previous php.cvs (#86345) next »