From 5fb61c83e38cb208f004a3d33730ce15dcb3a772 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sat, 18 Mar 2017 02:17:35 -0700 Subject: [PATCH] FRONTPANEL: Fix Coverity identified issues --- sim_frontpanel.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sim_frontpanel.c b/sim_frontpanel.c index 6f485ce7..f4a84049 100644 --- a/sim_frontpanel.c +++ b/sim_frontpanel.c @@ -1943,9 +1943,9 @@ while ((p->sock != INVALID_SOCKET) && data = strtoull (e, NULL, 16); if (little_endian) - memcpy (p->regs[i].addr, &data, p->regs[i].size); + memcpy (r->addr, &data, r->size); else - memcpy (p->regs[i].addr, ((char *)&data) + sizeof(data)-p->regs[i].size, p->regs[i].size); + memcpy (r->addr, ((char *)&data) + sizeof(data)-r->size, r->size); r = NULL; } s = eol; @@ -2138,7 +2138,8 @@ while ((p->sock != INVALID_SOCKET) && for (c = strchr (repeat, '\r'); c != NULL; c = strchr (c, '\r')) *c = ';'; /* replace carriage returns with semicolons */ c = strstr (repeat, register_get_echo); /* remove register_done_echo string and */ - strcpy (c, register_repeat_echo); /* replace it with the register_repeat_echo string */ + if (c) /* always true */ + strcpy (c, register_repeat_echo); /* replace it with the register_repeat_echo string */ if (_panel_sendf (p, &cmd_stat, NULL, "%s", repeat)) { pthread_mutex_lock (&p->io_lock); free (repeat);