--- libelwix/src/array.c 2019/01/23 17:40:37 1.8.4.2 +++ libelwix/src/array.c 2024/10/28 09:58:51 1.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: array.c,v 1.8.4.2 2019/01/23 17:40:37 misho Exp $ +* $Id: array.c,v 1.10 2024/10/28 09:58:51 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2019 +Copyright 2004 - 2024 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -234,7 +234,8 @@ array_Reset(array_t * __restrict arr, int purge) arr->arr_data = e_calloc(array_Size(arr), sizeof(intptr_t)); } - array_Zero(arr); + if (arr->arr_data) + array_Zero(arr); } /* @@ -375,6 +376,8 @@ array_Concat(array_t * __restrict dest, array_t * __re n = array_Size(dest); if (array_Grow(dest, n + array_Size(src), 0)) return -1; + if (!dest->arr_data) + return -1; memcpy(dest->arr_data + n, src->arr_data, array_Size(src) * sizeof(intptr_t)); dest->arr_last = array_Len(dest); @@ -422,6 +425,8 @@ array_Elem(array_t * __restrict arr, int n, void *data if (n >= array_Size(arr) && array_Grow(arr, n + 1, 0)) return (void*) -1; + if (!arr->arr_data) + return (void*) -1; dat = array_Get(arr, n); if (data) @@ -450,6 +455,8 @@ array_Push(array_t * __restrict arr, void *data, int n if (nogrow && ret >= array_Size(arr)) return -1; if (!nogrow && ret >= array_Size(arr) && array_Grow(arr, ret + 1, 0)) + return -1; + if (!arr->arr_data) return -1; ret = ++arr->arr_last;