From 4939e42c0fe4978cb533f2ded7b9b953588670b5 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 14 Jan 2017 14:14:12 +0100 Subject: [PATCH] MAVLink main: Fix resource leak for non-NuttX cases --- src/modules/mavlink/mavlink_main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 7c99187541..f267752476 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2012-2016 PX4 Development Team. All rights reserved. + * Copyright (c) 2012-2017 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -460,7 +460,7 @@ Mavlink::destroy_all_instances() while (_mavlink_instances) { inst_to_del = _mavlink_instances; LL_DELETE(_mavlink_instances, inst_to_del); - delete(inst_to_del); + delete (inst_to_del); } printf("\n"); @@ -2183,7 +2183,9 @@ Mavlink::task_main(int argc, char *argv[]) // the file stream. Since this is a one-time // config thing, we leave the file struct // allocated. - //fclose(fs); +#ifndef __PX4_NUTTX + fclose(fs); +#endif } else { PX4_WARN("open fd %d failed", _uart_fd);