close memory stream before returning on parsing error - release

This commit is contained in:
Philippe G
2021-08-09 18:01:48 -07:00
parent 6e082a5654
commit c4bd320afe
2 changed files with 9 additions and 0 deletions

View File

@@ -306,6 +306,7 @@ static int do_bt_source_cmd(int argc, char **argv){
} }
if(nerrors >0){ if(nerrors >0){
arg_print_errors(f,bt_source_args.end,desc_bt_source); arg_print_errors(f,bt_source_args.end,desc_bt_source);
fclose(f);
return 1; return 1;
} }
@@ -416,6 +417,7 @@ static int do_audio_cmd(int argc, char **argv){
} }
if(nerrors >0){ if(nerrors >0){
arg_print_errors(f,audio_args.end,desc_audio); arg_print_errors(f,audio_args.end,desc_audio);
fclose(f);
return 1; return 1;
} }
@@ -479,6 +481,7 @@ static int do_spdif_cmd(int argc, char **argv){
} }
if(nerrors >0){ if(nerrors >0){
arg_print_errors(f,spdif_args.end,desc_dac); arg_print_errors(f,spdif_args.end,desc_dac);
fclose(f);
return 1; return 1;
} }
nerrors+=is_output_gpio(spdif_args.clock, f, &i2s_dac_pin.pin.bck_io_num, true); 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){ if(nerrors >0){
arg_print_errors(f,rotary_args.end,desc_rotary); arg_print_errors(f,rotary_args.end,desc_rotary);
fclose(f);
return 1; return 1;
} }
nerrors+=is_gpio(rotary_args.A, f, &rotary.A, true,false); 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){ if(nerrors >0){
arg_print_errors(f,i2s_args.end,desc_dac); arg_print_errors(f,i2s_args.end,desc_dac);
fclose(f);
return 1; return 1;
} }
nerrors+=is_output_gpio(i2s_args.clock, f, &i2s_dac_pin.pin.bck_io_num, true); 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 *)); argv = (char **) calloc(22, sizeof(char *));
if (argv == NULL) { if (argv == NULL) {
FREE_AND_NULL(nvs_config); FREE_AND_NULL(nvs_config);
fclose(f);
return values; return values;
} }
size_t argc = esp_console_split_argv(nvs_config, argv,22); size_t argc = esp_console_split_argv(nvs_config, argv,22);

View File

@@ -324,6 +324,7 @@ static int do_i2c_set_display(int argc, char **argv)
} }
if(nerrors>0){ if(nerrors>0){
arg_print_errors(f,i2cdisp_args.end,desc_display); arg_print_errors(f,i2cdisp_args.end,desc_display);
fclose(f);
return 1; return 1;
} }
/* Check "--type" option */ /* Check "--type" option */
@@ -446,6 +447,7 @@ static int do_spiconfig_cmd(int argc, char **argv){
} }
if(nerrors>0){ if(nerrors>0){
arg_print_errors(f,spiconfig_args.end,desc_spiconfig); arg_print_errors(f,spiconfig_args.end,desc_spiconfig);
fclose(f);
return 1; return 1;
} }
/* Check "--clk" option */ /* Check "--clk" option */
@@ -520,6 +522,7 @@ static int do_i2cconfig_cmd(int argc, char **argv)
} }
if(nerrors>0){ if(nerrors>0){
arg_print_errors(f,i2cconfig_args.end,desc_i2c); arg_print_errors(f,i2cconfig_args.end,desc_i2c);
fclose(f);
return 1; return 1;
} }
/* Check "--port" option */ /* Check "--port" option */