fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 01:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix logger: avoid leaking file descriptor in get_log_time()

Browse Source 
orb_subscribe can succeed, but if there is no publisher, orb_copy will fail.
We still need to unsubscribe in that case.
This commit is contained in:
Beat Küng
2016-10-31 12:41:04 +01:00
committed by Lorenz Meier
parent 2908f1c16d
commit 00cd2902c7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/logger.cpp
+2 -1
View File
@@ -1124,13 +1124,14 @@ bool Logger::get_log_time(struct tm *tt, bool boot_time)
if (orb_copy(ORB_ID(vehicle_gps_position), vehicle_gps_position_sub, &gps_pos) == 0) { if (orb_copy(ORB_ID(vehicle_gps_position), vehicle_gps_position_sub, &gps_pos) == 0) {
utc_time_sec = gps_pos.time_utc_usec / 1e6; utc_time_sec = gps_pos.time_utc_usec / 1e6;
orb_unsubscribe(vehicle_gps_position_sub);
if (gps_pos.fix_type >= 2 && utc_time_sec >= GPS_EPOCH_SECS) { if (gps_pos.fix_type >= 2 && utc_time_sec >= GPS_EPOCH_SECS) {
use_clock_time = false; use_clock_time = false;
} }
} }
orb_unsubscribe(vehicle_gps_position_sub);
if (use_clock_time) { if (use_clock_time) {
/* take clock time if there's no fix (yet) */ /* take clock time if there's no fix (yet) */
struct timespec ts; struct timespec ts;