Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixes memory leak introduced in 2b9af967
This commit is contained in:
Stanislav Malyshev 2014-11-30 18:26:39 -08:00
commit de65eaa8c8

View File

@ -3690,6 +3690,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRML
return FAILURE;
} else {
set_timezone_from_timelib_time(tzobj, dummy_t);
free(dummy_t->tz_abbr);
efree(dummy_t);
return SUCCESS;
}