interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix memory leaks. (#328) 

Change-Id: Ic5262101b1a572cfcf91f29f813a24df3899fd0c
This commit is contained in:
Tim Newsome 2018-11-12 13:02:11 -08:00 committed by GitHub
parent f042dcb0a3
commit 967238fb6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/flash/nor/fespi.c
View File

@ -501,6 +501,7 @@ static struct algorithm_steps *as_delete(struct algorithm_steps *as)
free(as->steps[step]); free(as->steps[step]);
as->steps[step] = NULL; as->steps[step] = NULL;
} }
free(as->steps);
free(as); free(as);
return NULL; return NULL;
} }
@ -695,17 +696,19 @@ static int steps_execute(struct algorithm_steps *as,
init_reg_param(&reg_params[1], "a1", xlen, PARAM_OUT); init_reg_param(&reg_params[1], "a1", xlen, PARAM_OUT);
buf_set_u64(reg_params[0].value, 0, xlen, ctrl_base); buf_set_u64(reg_params[0].value, 0, xlen, ctrl_base);
buf_set_u64(reg_params[1].value, 0, xlen, data_wa->address); buf_set_u64(reg_params[1].value, 0, xlen, data_wa->address);
int retval = ERROR_OK;
while (!as_empty(as)) { while (!as_empty(as)) {
keep_alive(); keep_alive();
uint8_t *data_buf = malloc(data_wa->size); uint8_t *data_buf = malloc(data_wa->size);
unsigned bytes = as_compile(as, data_buf, data_wa->size); unsigned bytes = as_compile(as, data_buf, data_wa->size);
int retval = target_write_buffer(target, data_wa->address, bytes, retval = target_write_buffer(target, data_wa->address, bytes,
data_buf); data_buf);
free(data_buf); free(data_buf);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR("Failed to write data to 0x%" TARGET_PRIxADDR ": %d", LOG_ERROR("Failed to write data to 0x%" TARGET_PRIxADDR ": %d",
data_wa->address, retval); data_wa->address, retval);
return retval; goto exit;
} }
retval = target_run_algorithm(target, 0, NULL, 2, reg_params, retval = target_run_algorithm(target, 0, NULL, 2, reg_params,
@ -714,11 +717,14 @@ static int steps_execute(struct algorithm_steps *as,
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR("Failed to execute algorithm at 0x%" TARGET_PRIxADDR ": %d", LOG_ERROR("Failed to execute algorithm at 0x%" TARGET_PRIxADDR ": %d",
algorithm_wa->address, retval); algorithm_wa->address, retval);
return retval; goto exit;
} }
} }
return ERROR_OK; exit:
destroy_reg_param(&reg_params[1]);
destroy_reg_param(&reg_params[0]);
return retval;
} }
static int fespi_write(struct flash_bank *bank, const uint8_t *buffer, static int fespi_write(struct flash_bank *bank, const uint8_t *buffer,