matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: random make-coverity-happy nits

Browse source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2023-09-20 15:27:23 +02:00
parent 592011b251
commit 448d690a35
7 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/event.c
View file

@ -791,7 +791,12 @@ static struct event *thread_get(struct event_loop *m, uint8_t type,
thread->master = m; thread->master = m;
thread->arg = arg; thread->arg = arg;
thread->yield = EVENT_YIELD_TIME_SLOT; /* default */ thread->yield = EVENT_YIELD_TIME_SLOT; /* default */
thread->ref = NULL; /* thread->ref is zeroed either by XCALLOC above or by memset before
* being put on the "unuse" list by thread_add_unuse().
* Setting it here again makes coverity complain about a missing
* lock :(
*/
/* thread->ref = NULL; */
thread->ignore_timer_late = false; thread->ignore_timer_late = false;
/* /*

1
lib/ipaddr.h
View file

@ -28,6 +28,7 @@ struct ipaddr {
enum ipaddr_type_t ipa_type; enum ipaddr_type_t ipa_type;
union { union {
uint8_t addr; uint8_t addr;
uint8_t addrbytes[16];
struct in_addr _v4_addr; struct in_addr _v4_addr;
struct in6_addr _v6_addr; struct in6_addr _v6_addr;
} ip; } ip;

4
lib/northbound.c
View file

@ -2691,7 +2691,6 @@ void nb_init(struct event_loop *tm,
size_t nmodules, bool db_enabled) size_t nmodules, bool db_enabled)
{ {
struct yang_module *loaded[nmodules], **loadedp = loaded; struct yang_module *loaded[nmodules], **loadedp = loaded;
bool explicit_compile;
/* /*
* Currently using this explicit compile feature in libyang2 leads to * Currently using this explicit compile feature in libyang2 leads to
@ -2699,8 +2698,9 @@ void nb_init(struct event_loop *tm,
* of modules until they have all been loaded into the context. This * of modules until they have all been loaded into the context. This
* avoids multiple recompiles of the same modules as they are * avoids multiple recompiles of the same modules as they are
* imported/augmented etc. * imported/augmented etc.
* (Done as a #define to make coverity happy)
*/ */
explicit_compile = false; #define explicit_compile false
nb_db_enabled = db_enabled; nb_db_enabled = db_enabled;

2
lib/prefix.c
View file

@ -261,7 +261,7 @@ int evpn_type5_prefix_match(const struct prefix *n, const struct prefix *p)
return 0; return 0;
prefixlen = evp->prefix.prefix_addr.ip_prefix_length; prefixlen = evp->prefix.prefix_addr.ip_prefix_length;
np = &evp->prefix.prefix_addr.ip.ip.addr; np = evp->prefix.prefix_addr.ip.ip.addrbytes;
/* If n's prefix is longer than p's one return 0. */ /* If n's prefix is longer than p's one return 0. */
if (prefixlen > p->prefixlen) if (prefixlen > p->prefixlen)

2
lib/printf/printfcommon.h
View file

@ -68,7 +68,7 @@ io_print(struct io_state *iop, const CHAR * __restrict ptr, size_t len)
{ {
size_t copylen = len; size_t copylen = len;
if (!iop->cb) if (!iop->cb || !len)
return 0; return 0;
if (iop->avail < copylen) if (iop->avail < copylen)
copylen = iop->avail; copylen = iop->avail;

2
lib/sha256.c
View file

@ -344,7 +344,7 @@ void HMAC__SHA256_Final(unsigned char digest[32], HMAC_SHA256_CTX *ctx)
void PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, void PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt,
size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen) size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen)
{ {
HMAC_SHA256_CTX PShctx, hctx; HMAC_SHA256_CTX PShctx = {}, hctx;
size_t i; size_t i;
uint8_t ivec[4]; uint8_t ivec[4];
uint8_t U[32]; uint8_t U[32];

7
lib/vty.c
View file

@ -2368,8 +2368,7 @@ static void vtysh_read(struct event *thread)
printf("result: %d\n", ret); printf("result: %d\n", ret);
printf("vtysh node: %d\n", vty->node); printf("vtysh node: %d\n", vty->node);
#endif /* VTYSH_DEBUG */ #endif /* VTYSH_DEBUG */
if (vty->pass_fd >= 0) {
if (vty->pass_fd != -1) {
memset(vty->pass_fd_status, 0, 4); memset(vty->pass_fd_status, 0, 4);
vty->pass_fd_status[3] = ret; vty->pass_fd_status[3] = ret;
vty->status = VTY_PASSFD; vty->status = VTY_PASSFD;
@ -2387,7 +2386,9 @@ static void vtysh_read(struct event *thread)
* => skip vty_event(VTYSH_READ, vty)! * => skip vty_event(VTYSH_READ, vty)!
*/ */
return; return;
} } else
/* normalize other invalid values */
vty->pass_fd = -1;
/* hack for asynchronous "write integrated" /* hack for asynchronous "write integrated"
* - other commands in "buf" will be ditched * - other commands in "buf" will be ditched