proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 21:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: use XREALLOC over realloc avoid coverity warning

Browse Source 
I believe coverity is complaining that the current code does not handle the
realloc fail case, in which case the original pointer is not freed, but NULL is
returned. The code assert()s it's not failed but that is not strong enough it
needs to abort which XREALLOC does and is a better integration into FRR-inrfa
anyway.

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2023-09-28 12:10:31 -04:00
parent 8640fc9c0a
commit 53511f252d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/darr.c
View File

@ -7,8 +7,9 @@
*/ */
#include <zebra.h> #include <zebra.h>
#include "darr.h" #include "darr.h"
#include "memory.h"
void __dar_resize(void **a, uint count, size_t esize); DEFINE_MTYPE_STATIC(LIB, DARR, "Dynamic Array");
static uint _msb(uint count) static uint _msb(uint count)
{ {
@ -56,15 +57,12 @@ void *__darr_resize(void *a, uint count, size_t esize)
uint ncount = darr_next_count(count, esize); uint ncount = darr_next_count(count, esize);
size_t osz = (a == NULL) ? 0 : darr_size(darr_cap(a), esize); size_t osz = (a == NULL) ? 0 : darr_size(darr_cap(a), esize);
size_t sz = darr_size(ncount, esize); size_t sz = darr_size(ncount, esize);
struct darr_metadata *dm = realloc(a ? _darr_meta(a) : NULL, sz); struct darr_metadata *dm = XREALLOC(MTYPE_DARR,
/* do *not* use a */ a ? _darr_meta(a) : NULL, sz);
assert(dm);
if (sz > osz) if (sz > osz)
memset((char *)dm + osz, 0, sz - osz); memset((char *)dm + osz, 0, sz - osz);
dm->cap = ncount; dm->cap = ncount;
return (void *)(dm + 1); return (void *)(dm + 1);
} }