diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-24 07:53:46 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-24 07:53:46 +0000 |
| commit | bf5f21e39a6c04c3845dc61becc90d8602546290 (patch) | |
| tree | 49de21fa0af834ac6b91bfde83280e87ae24d318 /src/jtag | |
| parent | 332c8d78d8007e810380d4d0d13a4d47b8fb4d52 (diff) | |
| download | openocd+libswd-bf5f21e39a6c04c3845dc61becc90d8602546290.tar.gz openocd+libswd-bf5f21e39a6c04c3845dc61becc90d8602546290.tar.bz2 openocd+libswd-bf5f21e39a6c04c3845dc61becc90d8602546290.tar.xz openocd+libswd-bf5f21e39a6c04c3845dc61becc90d8602546290.zip | |
Steve Grubb <sgrubb@redhat.com> fix various and sundry leaks
git-svn-id: svn://svn.berlios.de/openocd/trunk@2606 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/tcl.c | 18 | ||||
| -rw-r--r-- | src/jtag/usbprog.c | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index ff16a566..defd6ef3 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -220,6 +220,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi) * */ if (goi->argc < 3) { Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ...."); + free(pTap); return JIM_ERR; } Jim_GetOpt_String(goi, &cp, NULL); @@ -249,6 +250,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi) e = Jim_GetOpt_Nvp(goi, opts, &n); if (e != JIM_OK) { Jim_GetOpt_NvpUnknown(goi, opts, 0); + free((void *)pTap->dotted_name); + free(pTap); return e; } LOG_DEBUG("Processing option: %s", n->name); @@ -266,12 +269,16 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi) e = Jim_GetOpt_Wide(goi, &w); if (e != JIM_OK) { Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name); + free((void *)pTap->dotted_name); + free(pTap); return e; } new_expected_ids = malloc(sizeof(uint32_t) * (pTap->expected_ids_cnt + 1)); if (new_expected_ids == NULL) { Jim_SetResult_sprintf(goi->interp, "no memory"); + free((void *)pTap->dotted_name); + free(pTap); return JIM_ERR; } @@ -290,6 +297,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi) e = Jim_GetOpt_Wide(goi, &w); if (e != JIM_OK) { Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name); + free((void *)pTap->dotted_name); + free(pTap); return e; } switch (n->value) { @@ -303,6 +312,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi) if (is_bad_irval(pTap->ir_length, w)) { LOG_ERROR("IR mask %x too big", (int) w); + free((void *)pTap->dotted_name); + free(pTap); return ERROR_FAIL; } pTap->ir_capture_mask = w; @@ -312,6 +323,8 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi) if (is_bad_irval(pTap->ir_length, w)) { LOG_ERROR("IR capture %x too big", (int) w); + free((void *)pTap->dotted_name); + free(pTap); return ERROR_FAIL; } pTap->ir_capture_value = w; @@ -1144,7 +1157,12 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c tap = jtag_tap_by_string(args[i*2]); if (tap == NULL) { + int j; + for (j = 0; j < i; j++) + free(fields[j].out_value); + free(fields); command_print(cmd_ctx, "Tap: %s unknown", args[i*2]); + return ERROR_FAIL; } int field_size = tap->ir_length; diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index 5abdf324..6c416644 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -435,6 +435,7 @@ struct usbprog_jtag* usbprog_jtag_open(void) } } } + free(tmp); return 0; } |