Replace argument = realloc( argument, size ); with realloc_or_free() in modules/...

[vlc] / modules / control / http / mvar.c

diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index 09d6ebd4d54c72a32f2a7537b3201d4e774b9c3a..9e9deb9b1c8f6075ab5bfe2c574cde921bb6234f 100644 (file)
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -31,6 +31,8 @@
 
 #include <assert.h>
 
+#include <vlc_memory.h>
+
 /* Utility function for scandir */
 static int Filter( const char *foo )
 {
@@ -55,6 +57,7 @@ mvar_t *mvar_New( const char *name, const char *value )
 
     v->i_field = 0;
     v->field = malloc( sizeof( mvar_t * ) );
+    assert( v->field );
     v->field[0] = NULL;
 
     return v;
@@ -77,7 +80,9 @@ void mvar_Delete( mvar_t *v )
 
 void mvar_AppendVar( mvar_t *v, mvar_t *f )
 {
-    v->field = realloc( v->field, sizeof( mvar_t * ) * ( v->i_field + 2 ) );
+    v->field = realloc_or_free( v->field,
+                                sizeof( mvar_t * ) * ( v->i_field + 2 ) );
+    assert( v->field );
     v->field[v->i_field] = f;
     v->i_field++;
 }
@@ -98,7 +103,9 @@ mvar_t *mvar_Duplicate( const mvar_t *v )
 
 void mvar_PushVar( mvar_t *v, mvar_t *f )
 {
-    v->field = realloc( v->field, sizeof( mvar_t * ) * ( v->i_field + 2 ) );
+    v->field = realloc_or_free( v->field,
+                                sizeof( mvar_t * ) * ( v->i_field + 2 ) );
+    assert( v->field );
     if( v->i_field > 0 )
     {
         memmove( &v->field[1], &v->field[0], sizeof( mvar_t * ) * v->i_field );