aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Mahr <stefan.mahr@sphairon.com>2013-03-12 11:00:50 +0100
committerSpencer Oliver <spen@spen-soft.co.uk>2013-03-13 12:54:46 +0000
commit30fde70c0321fd70d9330d5c6b56ed4e86653dd9 (patch)
tree428ddfa9ded8e830ce5adb5a4d800c66805d5e34
parentfac9057f022e5752fdfbe238ea69219d945d884e (diff)
jtag: usb_blaster: fix allocation of usb_blaster_device_desc
usb_blaster_device_desc was allocated, but never freed. Change-Id: I764bd092c71b8c260b98aab0e7a1710fd7bfa9fd Signed-off-by: Stefan Mahr <stefan.mahr@sphairon.com> Reviewed-on: http://openocd.zylin.com/1224 Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk> Tested-by: jenkins
-rw-r--r--src/jtag/drivers/usb_blaster.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/jtag/drivers/usb_blaster.c b/src/jtag/drivers/usb_blaster.c
index 91c48365..2ef800db 100644
--- a/src/jtag/drivers/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster.c
@@ -338,7 +338,7 @@ static int usb_blaster_init(void)
if (usb_blaster_device_desc == NULL) {
LOG_WARNING("no usb_blaster device description specified, "
"using default 'USB-Blaster'");
- usb_blaster_device_desc = "USB-Blaster";
+ usb_blaster_device_desc = strdup("USB-Blaster");
}
#if IS_WIN32 == 0
@@ -469,6 +469,11 @@ static int usb_blaster_quit(void)
ftdi_deinit(&ftdic);
#endif
+ if (usb_blaster_device_desc) {
+ free(usb_blaster_device_desc);
+ usb_blaster_device_desc = NULL;
+ }
+
return ERROR_OK;
}