Skip to content

V
vlc-1.1
Commit 4c8dc8e9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Abort if array allocation fails

parent 359b5a0e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
include/vlc_arrays.h
View file @ 4c8dc8e9
......@@ -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) { \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment