openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-23 09:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wav.c : Add workaround for excessively long coding history in the 'bext' chunk.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2006-10-27 10:12:09 +00:00
parent baa4690aa3
commit 2b78350a24
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-10-27 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/sd2.c
Add workaround for switched sample rate and sample size.
* src/wav.c
Add workaround for excessively long coding history in the 'bext' chunk.
2006-10-23 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/sndfile.h.in src/sndfile.c src/wav.c doc/command.html

28
src/wav.c
View File

@ -1579,21 +1579,22 @@ int
wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize)
{
SF_BROADCAST_INFO* b ;
int bytes = 0 ;
if ((psf->broadcast_info = calloc (1, sizeof (SF_BROADCAST_INFO))) == NULL)
{ psf->error = SFE_MALLOC_FAILED ;
return -1 ;
return psf->error ;
} ;
b = psf->broadcast_info ;
psf_binheader_readf (psf, "b", b->description, sizeof (b->description)) ;
psf_binheader_readf (psf, "b", b->originator, sizeof (b->originator)) ;
psf_binheader_readf (psf, "b", b->originator_reference, sizeof (b->originator_reference)) ;
psf_binheader_readf (psf, "b", b->origination_date, sizeof (b->origination_date)) ;
psf_binheader_readf (psf, "b", b->origination_time, sizeof (b->origination_time)) ;
psf_binheader_readf (psf, "442", &b->time_reference_low, &b->time_reference_high, &b->version) ;
psf_binheader_readf (psf, "bj", &b->umid, sizeof (b->umid), 190) ;
bytes += psf_binheader_readf (psf, "b", b->description, sizeof (b->description)) ;
bytes += psf_binheader_readf (psf, "b", b->originator, sizeof (b->originator)) ;
bytes += psf_binheader_readf (psf, "b", b->originator_reference, sizeof (b->originator_reference)) ;
bytes += psf_binheader_readf (psf, "b", b->origination_date, sizeof (b->origination_date)) ;
bytes += psf_binheader_readf (psf, "b", b->origination_time, sizeof (b->origination_time)) ;
bytes += psf_binheader_readf (psf, "442", &b->time_reference_low, &b->time_reference_high, &b->version) ;
bytes += psf_binheader_readf (psf, "bj", &b->umid, sizeof (b->umid), 190) ;
if (chunksize > WAV_BEXT_CHUNK_SIZE)
{ /* File has coding history data. */
@ -1601,17 +1602,16 @@ wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize)
b->coding_history_size = chunksize - WAV_BEXT_CHUNK_SIZE ;
if (b->coding_history_size > SIGNED_SIZEOF (b->coding_history))
{ free (psf->broadcast_info) ;
psf->broadcast_info = NULL ;
psf->error = SFE_MALLOC_FAILED ;
return -1 ;
} ;
b->coding_history_size = SIGNED_SIZEOF (b->coding_history) ;
/* We do not parse the coding history */
psf_binheader_readf (psf, "b", b->coding_history, b->coding_history_size) ;
bytes += psf_binheader_readf (psf, "b", b->coding_history, b->coding_history_size) ;
b->coding_history [sizeof (b->coding_history) - 1] = 0 ;
} ;
if (bytes < chunksize)
psf_binheader_readf (psf, "j", chunksize - bytes) ;
return 0 ;
} /* wav_read_bext_chunk */