Re: [PATCH conntrack-tools 1/3] conntrackd: prevent memory loss if reallocation fails

[Pablo Neira Ayuso <pablo@netfilter.org>]

On Fri, Mar 01, 2024 at 12:07:29PM -0500, Donald Yandt wrote:
> Signed-off-by: Donald Yandt <donald.yandt@gmail.com>
> ---
>  src/vector.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/vector.c b/src/vector.c
> index c81e7ce..7f9bc3c 100644
> --- a/src/vector.c
> +++ b/src/vector.c
> @@ -62,11 +62,12 @@ int vector_add(struct vector *v, void *data)
>  {
>  	if (v->cur_elems >= v->max_elems) {
>  		v->max_elems += DEFAULT_VECTOR_GROWTH;
> -		v->data = realloc(v->data, v->max_elems * v->size);
> -		if (v->data == NULL) {

Good catch.

> +		void *ptr = realloc(v->data, v->max_elems * v->size);

Could you declare void *ptr at the top of the function? Following old
style variable declarations?

Thanks.

> +		if (ptr == NULL) {
>  			v->max_elems -= DEFAULT_VECTOR_GROWTH;
>  			return -1;
>  		}
> +		v->data = ptr;
>  	}
>  	memcpy(v->data + (v->size * v->cur_elems), data, v->size);
>  	v->cur_elems++;
> -- 
> 2.44.0
> 
>