From effdc436f20dd6c5200ab384f4a85dbc47bcc84b Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Tue, 20 Nov 2018 16:19:37 -0700 Subject: [PATCH] AP_Param: Fix a mixture of new/free --- libraries/AP_Param/AP_Param.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Param/AP_Param.cpp b/libraries/AP_Param/AP_Param.cpp index a3080b5b05..c43252b7d9 100644 --- a/libraries/AP_Param/AP_Param.cpp +++ b/libraries/AP_Param/AP_Param.cpp @@ -1942,7 +1942,7 @@ bool AP_Param::load_defaults_file(const char *filename, bool last_pass) } num_param_overrides = 0; - param_overrides = new param_override[num_defaults]; + param_overrides = (struct param_override *)malloc(sizeof(struct param_override)*num_defaults); if (param_overrides == nullptr) { AP_HAL::panic("AP_Param: Failed to allocate overrides"); return false; @@ -2037,7 +2037,7 @@ void AP_Param::load_embedded_param_defaults(bool last_pass) return; } - param_overrides = new param_override[num_defaults]; + param_overrides = (struct param_override *)malloc(sizeof(struct param_override)*num_defaults); if (param_overrides == nullptr) { AP_HAL::panic("AP_Param: Failed to allocate overrides"); return;