Browse Source

MFB: fix several leaks in date_sun*() functions

migration/RELEASE_1_0_0
Antony Dovgal 21 years ago
parent
commit
41e5bcd8c5
  1. 5
      ext/date/lib/parse_tz.c
  2. 5
      ext/date/php_date.c

5
ext/date/lib/parse_tz.c

@ -368,6 +368,7 @@ timelib_time_offset *timelib_get_time_zone_info(timelib_sll ts, timelib_tzinfo *
timelib_sll timelib_get_current_offset(timelib_time *t)
{
timelib_time_offset *gmt_offset;
timelib_sll retval;
switch (t->zone_type) {
case TIMELIB_ZONETYPE_ABBR:
@ -376,7 +377,9 @@ timelib_sll timelib_get_current_offset(timelib_time *t)
case TIMELIB_ZONETYPE_ID:
gmt_offset = timelib_get_time_zone_info(t->sse, t->tz_info);
return gmt_offset->offset;
retval = gmt_offset->offset;
timelib_time_offset_dtor(gmt_offset);
return retval;
default:
return 0;

5
ext/date/php_date.c

@ -1901,7 +1901,8 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su
timelib_unixtime2local(t, time);
rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude, altitude > -1 ? 1 : 0, &h_rise, &h_set, &rise, &set, &transit);
timelib_time_dtor(t);
if (rs != 0) {
RETURN_FALSE;
}
@ -2044,6 +2045,8 @@ PHP_FUNCTION(date_sun_info)
t2->sse = set;
add_assoc_long(return_value, "astronomical_twilight_end", timelib_date_to_int(t2, &dummy));
}
timelib_time_dtor(t);
timelib_time_dtor(t2);
}
/* }}} */
/*

Loading…
Cancel
Save