diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2004-06-01 21:37:16 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2004-06-01 21:37:16 +0000 |
| commit | 557c2e79434b053e18c43ca964cb15152af07e21 (patch) | |
| tree | 86d315033ce9edfc33decc87e6800e7274a92f18 | |
| parent | fd36dede180a20f48353692e1a1c61f28554b26f (diff) | |
| download | xine-lib-557c2e79434b053e18c43ca964cb15152af07e21.tar.gz xine-lib-557c2e79434b053e18c43ca964cb15152af07e21.tar.bz2 | |
Tighter checking on header for presence of codec init data
CVS patchset: 6627
CVS date: 2004/06/01 21:37:16
| -rw-r--r-- | src/libfaad/xine_decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c index a7459bb7b..b69da4183 100644 --- a/src/libfaad/xine_decoder.c +++ b/src/libfaad/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.32 2004/05/24 22:17:58 jstembridge Exp $ + * $Id: xine_decoder.c,v 1.33 2004/06/01 21:37:16 jstembridge Exp $ * */ @@ -286,10 +286,10 @@ static void faad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { if( !this->bits_per_sample ) this->bits_per_sample = 16; - if( buf->size ) { + if( buf->size > sizeof(xine_waveformatex) ) { xine_waveformatex *wavex = (xine_waveformatex *) buf->content; - if( wavex->cbSize ) { + if( wavex->cbSize > 0 ) { this->dec_config = xine_xmalloc(wavex->cbSize); this->dec_config_size = wavex->cbSize; memcpy(this->dec_config, buf->content + sizeof(xine_waveformatex), |