Commit 2c32483b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Fix malloc error handling

(bug reported by David Thiel)
parent c296e05b
...@@ -280,24 +280,20 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout, ...@@ -280,24 +280,20 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout,
/* This necessarily allocates in the heap. */ /* This necessarily allocates in the heap. */
aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer ); aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer );
p_buffer->i_nb_samples = i_nb_samples; if( p_buffer != NULL )
p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame
/ p_input->input.i_frame_length; / p_input->input.i_frame_length;
/* Suppose the decoder doesn't have more than one buffered buffer */ /* Suppose the decoder doesn't have more than one buffered buffer */
p_input->b_changed = 0; p_input->b_changed = 0;
vlc_mutex_unlock( &p_input->lock ); vlc_mutex_unlock( &p_input->lock );
if ( p_buffer == NULL ) if( p_buffer == NULL )
{ return NULL;
msg_Err( p_aout, "NULL buffer !" );
}
else
{
p_buffer->start_date = p_buffer->end_date = 0;
}
p_buffer->i_nb_samples = i_nb_samples;
p_buffer->start_date = p_buffer->end_date = 0;
return p_buffer; return p_buffer;
} }
......
Supports Markdown
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