X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_arrays.h;h=390c1b6d9df4d275619b9c62945d352e063b4229;hb=4b9c63a36eded246ad9ef1ea0de0cf7b38d29ad9;hp=90ef202247651ad6ea44bb50440ae3ae93d32fda;hpb=74e5a0727b83ea8bd5ee87dbce7596b990ef14c1;p=vlc diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index 90ef202247..390c1b6d9d 100644 --- a/include/vlc_arrays.h +++ b/include/vlc_arrays.h @@ -50,6 +50,7 @@ static inline void *realloc_down( void *ptr, size_t size ) { \ if( !i_oldsize ) (p_ar) = NULL; \ (p_ar) = VLCCVP realloc( p_ar, ((i_oldsize) + 1) * sizeof(*(p_ar)) ); \ + if( !(p_ar) ) abort(); \ if( (i_oldsize) - (i_pos) ) \ { \ memmove( (p_ar) + (i_pos) + 1, (p_ar) + (i_pos), \ @@ -99,6 +100,7 @@ static inline void *realloc_down( void *ptr, size_t size ) (tab) = cast realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \ else \ (tab) = cast malloc( sizeof( void ** ) ); \ + if( !(tab) ) abort(); \ (tab)[count] = (p); \ (count)++; \ } while(0) @@ -149,6 +151,7 @@ static inline void *realloc_down( void *ptr, size_t size ) (tab) = cast realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \ else \ (tab) = cast malloc( sizeof( void ** ) ); \ + if( !(tab) ) abort(); \ if( (count) - (index) > 0 ) \ memmove( (void**)(tab) + (index) + 1, \ (void**)(tab) + (index), \ @@ -197,6 +200,7 @@ static inline void *realloc_down( void *ptr, size_t size ) (array).i_alloc = newsize; \ (array).p_elems = VLCCVP realloc( (array).p_elems, (array).i_alloc * \ sizeof(*(array).p_elems) ); \ + if( !(array).p_elems ) abort(); \ } #define _ARRAY_GROW1(array) { \