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

[vlc] / modules / demux / gme.cpp

diff --git a/modules/demux/gme.cpp b/modules/demux/gme.cpp
index 15f33c1825d6ddb19baa61dc210e7b269426414f..d0ec1ce931b310fe2d54e84345b42d4274601fe3 100644 (file)
--- a/modules/demux/gme.cpp
+++ b/modules/demux/gme.cpp
@@ -25,7 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #include "Nsf_Emu.h"
 #include "Gbs_Emu.h"
@@ -45,15 +50,15 @@ using namespace std;
 static int  Open    ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
-vlc_module_begin();
-    set_shortname( "GME");
-    set_description( _("GME demuxer (Game_Music_Emu)" ) );
-    set_capability( "demux2", 10 );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_callbacks( Open, Close );
-    add_shortcut( "gme" );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "GME")
+    set_description( N_("GME demuxer (Game_Music_Emu)" ) )
+    set_capability( "demux", 10 )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
+    set_callbacks( Open, Close )
+    add_shortcut( "gme" )
+vlc_module_end ()
 
 /*****************************************************************************
  * Local prototypes
@@ -114,7 +119,7 @@ static int Open( vlc_object_t *p_this )
     vlc_value_t val;
  
     /* We accept file based on extention match */
-    if( strcasecmp( p_demux->psz_demux, "gme" ) )
+    if( !p_demux->b_force )
     {
         if( ( ext = strrchr( p_demux->psz_path, '.' ) ) == NULL ||
             stream_Size( p_demux->s ) == 0 ) return VLC_EGENERIC;
@@ -143,10 +148,12 @@ static int Open( vlc_object_t *p_this )
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
     p_demux->p_sys = p_sys = (demux_sys_t *)malloc( sizeof( demux_sys_t ) );
+    assert(p_sys);
 
     msg_Dbg( p_demux, "loading complete file (could be long)" );
     p_sys->i_data = stream_Size( p_demux->s );
     p_sys->p_data = (uint8_t *)malloc( p_sys->i_data );
+    assert(p_sys->p_data);
     p_sys->i_data = stream_Read( p_demux->s, p_sys->p_data, p_sys->i_data );
     if( p_sys->i_data <= 0 )
     {
@@ -415,7 +422,6 @@ switch( i_query )
             {
                 ModPlug_Seek( p_sys->f, i64 / 1000 );
                 p_sys->i_time = i64 + 1;
-                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 
                 return VLC_SUCCESS;
             }
@@ -438,7 +444,6 @@ switch( i_query )
             {
                 ModPlug_Seek( p_sys->f, i64 / 1000 );
                 p_sys->i_time = i64 + 1;
-                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 
                 return VLC_SUCCESS;
             }
@@ -452,6 +457,7 @@ switch( i_query )
 
                 *pi_int = p_sys->i_tracks;
                 *ppp_title = (input_title_t**)malloc( sizeof( input_title_t**) * p_sys->i_tracks );
+                assert( *ppp_sitle );
 
                 for( int i = 0; i < p_sys->i_tracks; i++ )
                 {
@@ -496,6 +502,7 @@ static void inflate_gzbuf(uint8_t * p_buffer, size_t i_size, uint8_t ** pp_obuff
 
     out_size = i_size * 2;
     out_buffer = (uint8_t*)malloc(out_size);
+    assert(out_buffer);
 
     z_str.next_in   = (unsigned char*)p_buffer;
     z_str.avail_in  = i_size;
@@ -517,7 +524,8 @@ static void inflate_gzbuf(uint8_t * p_buffer, size_t i_size, uint8_t ** pp_obuff
         case Z_BUF_ERROR:
             offset = z_str.next_out - out_buffer;
             out_size *= 2;
-            out_buffer = (uint8_t *)realloc(out_buffer, out_size);
+            out_buffer = (uint8_t *)realloc_or_free(out_buffer, out_size);
+            assert(out_buffer);
             z_str.next_out  = out_buffer + offset;
             z_str.avail_out = out_size - offset;
             break;
@@ -532,7 +540,8 @@ static void inflate_gzbuf(uint8_t * p_buffer, size_t i_size, uint8_t ** pp_obuff
 
     inflateEnd(&z_str);
  
-    out_buffer = (uint8_t *)realloc(out_buffer, *pi_osize);
+    out_buffer = (uint8_t *)realloc_or_free(out_buffer, *pi_osize);
+    assert(out_buffer);
     (*pp_obuffer) = out_buffer;
 }
 #endif