From c4bd320afe88e405911b7d05897d2614c11fa180 Mon Sep 17 00:00:00 2001 From: Philippe G Date: Mon, 9 Aug 2021 18:01:48 -0700 Subject: [PATCH] close memory stream before returning on parsing error - release --- components/platform_console/cmd_config.c | 6 ++++++ components/platform_console/cmd_i2ctools.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/components/platform_console/cmd_config.c b/components/platform_console/cmd_config.c index 906bc3cc..e138041a 100644 --- a/components/platform_console/cmd_config.c +++ b/components/platform_console/cmd_config.c @@ -306,6 +306,7 @@ static int do_bt_source_cmd(int argc, char **argv){ } if(nerrors >0){ arg_print_errors(f,bt_source_args.end,desc_bt_source); + fclose(f); return 1; } @@ -416,6 +417,7 @@ static int do_audio_cmd(int argc, char **argv){ } if(nerrors >0){ arg_print_errors(f,audio_args.end,desc_audio); + fclose(f); return 1; } @@ -479,6 +481,7 @@ static int do_spdif_cmd(int argc, char **argv){ } if(nerrors >0){ arg_print_errors(f,spdif_args.end,desc_dac); + fclose(f); return 1; } nerrors+=is_output_gpio(spdif_args.clock, f, &i2s_dac_pin.pin.bck_io_num, true); @@ -517,6 +520,7 @@ static int do_rotary_cmd(int argc, char **argv){ } if(nerrors >0){ arg_print_errors(f,rotary_args.end,desc_rotary); + fclose(f); return 1; } nerrors+=is_gpio(rotary_args.A, f, &rotary.A, true,false); @@ -584,6 +588,7 @@ static int do_i2s_cmd(int argc, char **argv) } if(nerrors >0){ arg_print_errors(f,i2s_args.end,desc_dac); + fclose(f); return 1; } nerrors+=is_output_gpio(i2s_args.clock, f, &i2s_dac_pin.pin.bck_io_num, true); @@ -805,6 +810,7 @@ cJSON * squeezelite_cb(){ argv = (char **) calloc(22, sizeof(char *)); if (argv == NULL) { FREE_AND_NULL(nvs_config); + fclose(f); return values; } size_t argc = esp_console_split_argv(nvs_config, argv,22); diff --git a/components/platform_console/cmd_i2ctools.c b/components/platform_console/cmd_i2ctools.c index 8af57e25..fd73b41a 100644 --- a/components/platform_console/cmd_i2ctools.c +++ b/components/platform_console/cmd_i2ctools.c @@ -324,6 +324,7 @@ static int do_i2c_set_display(int argc, char **argv) } if(nerrors>0){ arg_print_errors(f,i2cdisp_args.end,desc_display); + fclose(f); return 1; } /* Check "--type" option */ @@ -446,6 +447,7 @@ static int do_spiconfig_cmd(int argc, char **argv){ } if(nerrors>0){ arg_print_errors(f,spiconfig_args.end,desc_spiconfig); + fclose(f); return 1; } /* Check "--clk" option */ @@ -520,6 +522,7 @@ static int do_i2cconfig_cmd(int argc, char **argv) } if(nerrors>0){ arg_print_errors(f,i2cconfig_args.end,desc_i2c); + fclose(f); return 1; } /* Check "--port" option */