From 37a2578ce4265f4ed495290923e3fa674c662656 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sun, 22 Jun 2008 22:05:09 +0200 Subject: [PATCH] Remove unneeded msg_Err. Fix potential segfault (check malloc return value). --- modules/audio_output/alsa.c | 3 --- modules/audio_output/arts.c | 3 --- modules/audio_output/auhal.c | 20 +------------------- modules/audio_output/directx.c | 3 --- modules/audio_output/esd.c | 3 --- modules/audio_output/file.c | 5 +---- modules/audio_output/hd1000a.cpp | 11 +++-------- modules/audio_output/jack.c | 3 --- modules/audio_output/oss.c | 3 --- modules/audio_output/portaudio.c | 3 --- modules/audio_output/waveout.c | 6 +----- modules/codec/avcodec/audio.c | 16 +++++++++------- modules/codec/avcodec/deinterlace.c | 1 - modules/codec/avcodec/encoder.c | 5 +---- modules/codec/avcodec/video.c | 1 - modules/codec/cmml/cmml.c | 1 - modules/codec/dmo/dmo.c | 2 -- modules/codec/dvbsub.c | 3 --- modules/codec/subtitles/subsdec.c | 3 --- modules/codec/subtitles/subsusf.c | 3 --- modules/demux/avi/avi.c | 3 --- modules/demux/mjpeg.c | 5 +---- modules/demux/playlist/xspf.c | 3 --- modules/demux/subtitle.c | 1 - modules/demux/subtitle_asa.c | 4 ++-- 25 files changed, 19 insertions(+), 95 deletions(-) diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index c6d7a58d99..5a2916fb47 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -313,10 +313,7 @@ static int Open( vlc_object_t *p_this ) /* Allocate structures */ p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } p_sys->b_playing = false; p_sys->start_date = 0; vlc_cond_init( p_aout, &p_sys->wait ); diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c index ef4b2617bd..525787d581 100644 --- a/modules/audio_output/arts.c +++ b/modules/audio_output/arts.c @@ -83,10 +83,7 @@ static int Open( vlc_object_t *p_this ) /* Allocate structure */ p_sys = malloc( sizeof( aout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } p_aout->output.p_sys = p_sys; i_err = arts_init(); diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index 7ef69e220a..067144950a 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -161,10 +161,7 @@ static int Open( vlc_object_t * p_this ) /* Allocate structure */ p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return( VLC_ENOMEM ); - } + return VLC_ENOMEM; p_sys = p_aout->output.p_sys; p_sys->i_default_dev = 0; @@ -649,10 +646,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) i_streams = i_param_size / sizeof( AudioStreamID ); p_streams = (AudioStreamID *)malloc( i_param_size ); if( p_streams == NULL ) - { - msg_Err( p_aout, "out of memory" ); return false; - } err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertyStreams, @@ -685,10 +679,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) i_formats = i_param_size / sizeof( AudioStreamBasicDescription ); p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size ); if( p_format_list == NULL ) - { - msg_Err( p_aout, "could not malloc the memory" ); continue; - } err = AudioStreamGetProperty( p_streams[i], 0, kAudioStreamPropertyPhysicalFormats, @@ -951,10 +942,7 @@ static void Probe( aout_instance_t * p_aout ) /* Allocate DeviceID array */ p_devices = (AudioDeviceID*)malloc( sizeof(AudioDeviceID) * p_sys->i_devices ); if( p_devices == NULL ) - { - msg_Err( p_aout, "out of memory" ); goto error; - } /* Populate DeviceID array */ err = AudioHardwareGetProperty( kAudioHardwarePropertyDevices, @@ -1101,10 +1089,7 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_ i_streams = i_param_size / sizeof( AudioStreamID ); p_streams = (AudioStreamID *)malloc( i_param_size ); if( p_streams == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } err = AudioDeviceGetProperty( i_dev_id, 0, FALSE, kAudioDevicePropertyStreams, @@ -1150,10 +1135,7 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_ i_formats = i_param_size / sizeof( AudioStreamBasicDescription ); p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size ); if( p_format_list == NULL ) - { - msg_Err( p_aout, "could not malloc the memory" ); return false; - } err = AudioStreamGetProperty( i_stream_id, 0, kAudioStreamPropertyPhysicalFormats, diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index 9df65151db..787bc3c142 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -254,10 +254,7 @@ static int OpenAudio( vlc_object_t *p_this ) /* Allocate structure */ p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } /* Initialize some variables */ p_aout->output.p_sys->p_dsobject = NULL; diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c index e844d14a6a..d42940e6d7 100644 --- a/modules/audio_output/esd.c +++ b/modules/audio_output/esd.c @@ -91,10 +91,7 @@ static int Open( vlc_object_t *p_this ) /* Allocate structure */ p_sys = malloc( sizeof( aout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } p_aout->output.p_sys = p_sys; diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index e2251c4b1a..c8af6f5f90 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -154,10 +154,7 @@ static int Open( vlc_object_t * p_this ) /* Allocate structure */ p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; if( !strcmp( psz_name, "-" ) ) p_aout->output.p_sys->p_file = stdout; diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp index 5e81ae7426..c111c2a6d1 100644 --- a/modules/audio_output/hd1000a.cpp +++ b/modules/audio_output/hd1000a.cpp @@ -97,18 +97,14 @@ static int Open( vlc_object_t * p_this ) p_aout->output.p_sys = p_sys = (aout_sys_t *)malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; /* New PCMAudioPlayer */ p_sys->pPlayer = pPlayer = new PCMAudioPlayer(); if( p_sys->pPlayer == NULL ) { - msg_Err( p_aout, "out of memory" ); free( p_sys ); - return VLC_EGENERIC; + return VLC_ENOMEM; } /* Get Buffer Requirements */ @@ -127,10 +123,9 @@ static int Open( vlc_object_t * p_this ) p_sys->ppBuffers = (void **)malloc( p_sys->nBuffers * sizeof( void * ) ); if( p_sys->ppBuffers == NULL ) { - msg_Err( p_aout, "out of memory" ); delete pPlayer; free( p_sys ); - return VLC_EGENERIC; + return VLC_ENOMEM; } /* Open PCMAudioPlayer */ diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c index 7fb409bb24..c8345db4a0 100644 --- a/modules/audio_output/jack.c +++ b/modules/audio_output/jack.c @@ -108,7 +108,6 @@ static int Open( vlc_object_t *p_this ) p_sys = calloc( 1, sizeof( aout_sys_t ) ); if( p_sys == NULL ) { - msg_Err( p_aout, "out of memory" ); status = VLC_ENOMEM; goto error_out; } @@ -143,7 +142,6 @@ static int Open( vlc_object_t *p_this ) sizeof(jack_port_t *) ); if( p_sys->p_jack_ports == NULL ) { - msg_Err( p_aout, "out of memory" ); status = VLC_ENOMEM; goto error_out; } @@ -152,7 +150,6 @@ static int Open( vlc_object_t *p_this ) sizeof(jack_sample_t *) ); if( p_sys->p_jack_buffers == NULL ) { - msg_Err( p_aout, "out of memory" ); status = VLC_ENOMEM; goto error_out; } diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 2ea467b3b6..db1e28e63e 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -279,10 +279,7 @@ static int Open( vlc_object_t *p_this ) /* Allocate structure */ p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } /* Get device name */ if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL ) diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c index 7c1d256baa..4e382dd593 100644 --- a/modules/audio_output/portaudio.c +++ b/modules/audio_output/portaudio.c @@ -181,10 +181,7 @@ static int Open( vlc_object_t * p_this ) /* Allocate p_sys structure */ p_sys = (aout_sys_t *)malloc( sizeof(aout_sys_t) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } p_sys->p_aout = p_aout; p_sys->p_stream = 0; p_aout->output.p_sys = p_sys; diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index 2a57e01a55..8ca55d8332 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -245,10 +245,7 @@ static int Open( vlc_object_t *p_this ) p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; p_aout->output.pf_play = Play; p_aout->b_die = false; @@ -411,7 +408,6 @@ static int Open( vlc_object_t *p_this ) if( p_aout->output.p_sys->p_silence_buffer == NULL ) { free( p_aout->output.p_sys ); - msg_Err( p_aout, "out of memory" ); return 1; } p_aout->output.p_sys->i_repeat_counter = 0; diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c index ca48b90b36..40213074ac 100644 --- a/modules/codec/avcodec/audio.c +++ b/modules/codec/avcodec/audio.c @@ -100,7 +100,6 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context, if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { - msg_Err( p_dec, "out of memory" ); return VLC_ENOMEM; } @@ -139,12 +138,15 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context, p_sys->p_context->extradata = malloc( p_sys->p_context->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE ); - memcpy( p_sys->p_context->extradata, - (char*)p_dec->fmt_in.p_extra + i_offset, - p_sys->p_context->extradata_size ); - memset( (char*)p_sys->p_context->extradata + - p_sys->p_context->extradata_size, 0, - FF_INPUT_BUFFER_PADDING_SIZE ); + if( p_sys->p_context->extradata ) + { + memcpy( p_sys->p_context->extradata, + (char*)p_dec->fmt_in.p_extra + i_offset, + p_sys->p_context->extradata_size ); + memset( (char*)p_sys->p_context->extradata + + p_sys->p_context->extradata_size, 0, + FF_INPUT_BUFFER_PADDING_SIZE ); + } } else p_sys->p_context->extradata = NULL; diff --git a/modules/codec/avcodec/deinterlace.c b/modules/codec/avcodec/deinterlace.c index c9299c2b00..0d6f07ddbc 100644 --- a/modules/codec/avcodec/deinterlace.c +++ b/modules/codec/avcodec/deinterlace.c @@ -84,7 +84,6 @@ int OpenDeinterlace( vlc_object_t *p_this ) if( ( p_filter->p_sys = p_sys = (filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL ) { - msg_Err( p_filter, "out of memory" ); return VLC_EGENERIC; } diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c index 3eaa2dcef5..23c2674465 100644 --- a/modules/codec/avcodec/encoder.c +++ b/modules/codec/avcodec/encoder.c @@ -253,10 +253,7 @@ int OpenEncoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the encoder's structure */ if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) - { - msg_Err( p_enc, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; memset( p_sys, 0, sizeof(encoder_sys_t) ); p_enc->p_sys = p_sys; p_sys->p_codec = p_codec; diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 6dc871317d..e1335af469 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -232,7 +232,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { - msg_Err( p_dec, "out of memory" ); return VLC_ENOMEM; } memset( p_sys, 0, sizeof(decoder_sys_t) ); diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c index a2bd47a1a6..2e5109efce 100644 --- a/modules/codec/cmml/cmml.c +++ b/modules/codec/cmml/cmml.c @@ -108,7 +108,6 @@ static int OpenDecoder( vlc_object_t *p_this ) if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { - msg_Err( p_dec, "out of memory" ); return VLC_EGENERIC; } diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c index 48d358de76..55fe6e279f 100644 --- a/modules/codec/dmo/dmo.c +++ b/modules/codec/dmo/dmo.c @@ -520,7 +520,6 @@ static int DecOpen( vlc_object_t *p_this ) if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { - msg_Err( p_dec, "out of memory" ); goto error; } @@ -1341,7 +1340,6 @@ static int EncOpen( vlc_object_t *p_this ) if( ( p_enc->p_sys = p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) { - msg_Err( p_enc, "out of memory" ); goto error; } diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c index 258d01c33a..a56c83d554 100644 --- a/modules/codec/dvbsub.c +++ b/modules/codec/dvbsub.c @@ -1664,10 +1664,7 @@ static int OpenEncoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) - { - msg_Err( p_enc, "out of memory" ); return VLC_ENOMEM; - } p_enc->p_sys = p_sys; p_enc->pf_encode_sub = Encode; diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c index cfb83a6e3d..5d4aaf2f3b 100644 --- a/modules/codec/subtitles/subsdec.c +++ b/modules/codec/subtitles/subsdec.c @@ -160,10 +160,7 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ p_dec->p_sys = p_sys = malloc( sizeof( *p_sys ) ); if( p_sys == NULL ) - { - msg_Err( p_dec, "out of memory" ); return VLC_ENOMEM; - } /* init of p_sys */ memset( p_sys, 0, sizeof( *p_sys ) ); diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c index 657ae4a037..162cd1d49d 100644 --- a/modules/codec/subtitles/subsusf.c +++ b/modules/codec/subtitles/subsusf.c @@ -79,7 +79,6 @@ static int OpenDecoder( vlc_object_t *p_this ) if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)calloc(1, sizeof(decoder_sys_t)) ) == NULL ) { - msg_Err( p_dec, "out of memory" ); return VLC_ENOMEM; } @@ -400,7 +399,6 @@ static subpicture_region_t *CreateTextRegion( decoder_t *p_dec, p_text_region->psz_html = strndup( psz_subtitle, i_len ); if( ! p_text_region->psz_html ) { - msg_Err( p_dec, "out of memory" ); p_spu->pf_destroy_region( VLC_OBJECT(p_dec), p_text_region ); return NULL; } @@ -649,7 +647,6 @@ static void ParseUSFHeaderTags( decoder_t *p_dec, xml_reader_t *p_xml_reader ) p_style = calloc( 1, sizeof(ssa_style_t) ); if( ! p_style ) { - msg_Err( p_dec, "out of memory" ); free( psz_node ); break; } diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index c3489481d4..723aa0efda 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -356,10 +356,7 @@ static int Open( vlc_object_t * p_this ) { avi_track_t *tk = malloc( sizeof( avi_track_t ) ); if( !tk ) - { - msg_Err( p_demux, "Out of memory" ); goto error; - } avi_chunk_list_t *p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i ); avi_chunk_strh_t *p_strh = AVI_ChunkFind( p_strl, AVIFOURCC_strh, 0 ); diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c index 165b415084..f601d92899 100644 --- a/modules/demux/mjpeg.c +++ b/modules/demux/mjpeg.c @@ -156,11 +156,8 @@ static char* GetLine( demux_t *p_demux, int *p_pos ) i--; } p_line = malloc( i + 1 ); - if( NULL == p_line ) - { - msg_Err( p_demux, "out of memory" ); + if( p_line == NULL ) return NULL; - } strncpy ( p_line, (char*)p_buf, i ); p_line[i] = '\0'; // msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line ); diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index 0dc77aeaab..42c1ed6e0d 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -545,10 +545,7 @@ static bool parse_track_node COMPLEX_INTERFACE strlen(p_demux->p_sys->psz_base) + strlen(psz_uri) +1 ); if( !psz_tmp ) - { - msg_Err( p_demux, "out of memory"); return false; - } sprintf( psz_tmp, "%s%s", p_demux->p_sys->psz_base, psz_uri ); free( psz_uri ); diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 46f26534be..14940862f7 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -449,7 +449,6 @@ static int Open ( vlc_object_t *p_this ) if( !( p_sys->subtitle = realloc( p_sys->subtitle, sizeof(subtitle_t) * i_max ) ) ) { - msg_Err( p_demux, "out of memory"); free( p_sys->subtitle ); TextUnload( &p_sys->txt ); free( p_sys ); diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c index cd6f4f79ee..273d8f39f9 100644 --- a/modules/demux/subtitle_asa.c +++ b/modules/demux/subtitle_asa.c @@ -140,6 +140,8 @@ static int Open ( vlc_object_t *p_this ) p_demux->pf_demux = Demux; p_demux->pf_control = Control; p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; p_sys->psz_header = NULL; p_sys->i_subtitle = 0; p_sys->i_subtitles = 0; @@ -220,7 +222,6 @@ static int Open ( vlc_object_t *p_this ) p_data = malloc( i_ssize ); if( !p_data ) { - msg_Err( p_demux, "out of memory"); free( p_sys ); return VLC_ENOMEM; } @@ -281,7 +282,6 @@ static int ProcessLine( demux_t *p_demux, void *p_arg, if( !( p_sys->subtitle = realloc( p_sys->subtitle, sizeof(subtitle_t) * p_sys->i_subs_alloc ) ) ) { - msg_Err( p_demux, "out of memory"); return VLC_ENOMEM; } } -- 2.39.2