aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>2013-07-10 11:06:26 +0200
committerSpencer Oliver <spen@spen-soft.co.uk>2013-07-15 09:56:24 +0000
commit3777b08affb17de2ee6b1dc1436239c1fba7f99e (patch)
tree43585c6c4fbe2ce0e22c9dd7016891b4f0e202fa
parentde353010c314130d9d45b080142c0a9a4ad0d447 (diff)
ftdi: Fix error in calloc retval check
Found by clang. Change-Id: Iaa952b063779f4d392d8bdc62a3e7ce9daef2740 Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Reviewed-on: http://openocd.zylin.com/1498 Tested-by: jenkins Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
-rw-r--r--src/jtag/drivers/ftdi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 20969c04..11a7414f 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -127,8 +127,10 @@ static struct signal *create_signal(const char *name)
psig = &(*psig)->next;
*psig = calloc(1, sizeof(**psig));
- if (*psig)
- (*psig)->name = strdup(name);
+ if (*psig == NULL)
+ return NULL;
+
+ (*psig)->name = strdup(name);
if ((*psig)->name == NULL) {
free(*psig);
*psig = NULL;