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

Make sure return values are initialised header buffer is full, add workarounds for messed up WAV files.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2006-01-29 10:54:06 +00:00
parent b7a841be6c
commit 3e1f762eab
3 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-01-29 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/common.c
Make sure return values are initialised header buffer is full.
* src/wav.c
Add workarounds for messed up WAV files.
2006-01-21 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* Win32/config.h

18
src/common.c
View File

@ -796,7 +796,7 @@ static int
header_read (SF_PRIVATE *psf, void *ptr, int bytes)
{ int count = 0 ;
if (psf->headindex + bytes > SIGNED_SIZEOF (psf->header))
if (psf->headindex >= SIGNED_SIZEOF (psf->header))
{ memset (ptr, 0, SIGNED_SIZEOF (psf->header) - psf->headindex) ;
/* This is the best that we can do. */
@ -804,6 +804,17 @@ header_read (SF_PRIVATE *psf, void *ptr, int bytes)
return bytes ;
} ;
if (psf->headindex + bytes > SIGNED_SIZEOF (psf->header))
{ int most ;
most = SIGNED_SIZEOF (psf->header) - psf->headindex ;
psf_fread (psf->header + psf->headend, 1, most, psf) ;
memset (ptr + most, 0, bytes - most) ;
psf_fseek (psf, bytes - most, SEEK_CUR) ;
return bytes ;
} ;
if (psf->headindex + bytes > psf->headend)
{ count = psf_fread (psf->header + psf->headend, 1, bytes - (psf->headend - psf->headindex), psf) ;
if (count != bytes - (int) (psf->headend - psf->headindex))
@ -943,11 +954,13 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...)
case '1' :
charptr = va_arg (argptr, char*) ;
*charptr = 0 ;
byte_count += header_read (psf, charptr, sizeof (char)) ;
break ;
case '2' :
shortptr = va_arg (argptr, unsigned short*) ;
*shortptr = 0 ;
ucptr = (unsigned char*) shortptr ;
byte_count += header_read (psf, ucptr, sizeof (short)) ;
if (psf->rwf_endian == SF_ENDIAN_BIG)
@ -958,6 +971,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...)
case '3' :
intptr = va_arg (argptr, unsigned int*) ;
*intptr = 0 ;
byte_count += header_read (psf, sixteen_bytes, 3) ;
if (psf->rwf_endian == SF_ENDIAN_BIG)
*intptr = GET_BE_3BYTE (sixteen_bytes) ;
@ -967,6 +981,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...)
case '4' :
intptr = va_arg (argptr, unsigned int*) ;
*intptr = 0 ;
ucptr = (unsigned char*) intptr ;
byte_count += header_read (psf, ucptr, sizeof (int)) ;
if (psf->rwf_endian == SF_ENDIAN_BIG)
@ -977,6 +992,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...)
case '8' :
countptr = va_arg (argptr, sf_count_t*) ;
*countptr = 0 ;
byte_count += header_read (psf, sixteen_bytes, 8) ;
if (psf->rwf_endian == SF_ENDIAN_BIG)
countdata = GET_BE_8BYTE (sixteen_bytes) ;

34
src/wav.c
View File

@ -60,6 +60,7 @@
#define PAD_MARKER (MAKE_MARKER ('P', 'A', 'D', ' '))
#define afsp_MARKER (MAKE_MARKER ('a', 'f', 's', 'p'))
#define clm_MARKER (MAKE_MARKER ('c', 'l', 'm', ' '))
#define elmo_MARKER (MAKE_MARKER ('e', 'l', 'm', 'o'))
#define ISFT_MARKER (MAKE_MARKER ('I', 'S', 'F', 'T'))
#define ICRD_MARKER (MAKE_MARKER ('I', 'C', 'R', 'D'))
@ -451,7 +452,15 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
bytesread = psf_binheader_readf (psf, "e44", &dword, &cue_count) ;
bytesread -= 4 ; /* Remove bytes for first dword. */
psf_log_printf (psf, "%M : %u\n Count : %d\n", marker, dword, cue_count) ;
psf_log_printf (psf, "%M : %u\n", marker, dword) ;
if (cue_count > 10)
{ psf_log_printf (psf, " Count : %d (skipping)\n", cue_count) ;
psf_binheader_readf (psf, "j", cue_count * 24) ;
break ;
} ;
psf_log_printf (psf, " Count : %d\n", cue_count) ;
while (cue_count)
{ bytesread += psf_binheader_readf (psf, "e444444", &id, &position,
@ -504,6 +513,7 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
case afsp_MARKER :
case bext_MARKER :
case clm_MARKER :
case elmo_MARKER :
case plst_MARKER :
case DISP_MARKER :
case MEXT_MARKER :
@ -530,7 +540,7 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
psf_binheader_readf (psf, "j", -3) ;
break ;
} ;
psf_log_printf (psf, "*** Unknown chunk marker : %X. Exiting parser.\n", marker) ;
psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D. Exiting parser.\n", marker, psf_ftell (psf) - 4) ;
done = SF_TRUE ;
break ;
} ; /* switch (dword) */
@ -1139,8 +1149,15 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk)
psf_binheader_readf (psf, "mj", &chunk, length - 4) ;
psf_log_printf (psf, " %M\n", chunk) ;
return 0 ;
}
else if (current_pos + length > psf->filelength)
} ;
if (psf->headindex + length > SIGNED_SIZEOF (psf->header))
{ psf_log_printf (psf, "%M : %d (too long)\n", chunk, length) ;
psf_binheader_readf (psf, "j", length) ;
return 0 ;
} ;
if (current_pos + length > psf->filelength)
{ psf_log_printf (psf, "%M : %d (should be %d)\n", chunk, length, (int) (psf->filelength - current_pos)) ;
length = psf->filelength - current_pos ;
}
@ -1177,7 +1194,7 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk)
case ISRC_MARKER :
bytesread += psf_binheader_readf (psf, "e4", &dword) ;
dword += (dword & 1) ;
if (dword > SIGNED_SIZEOF (psf->u.cbuf))
if (dword < 0 || dword > SIGNED_SIZEOF (psf->u.cbuf))
{ psf_log_printf (psf, " *** %M : %d (too big)\n", chunk, dword) ;
psf_binheader_readf (psf, "j", dword) ;
break ;
@ -1196,15 +1213,16 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk)
bytesread += psf_binheader_readf (psf, "e44", &dword, &mark_id) ;
dword -= 4 ;
dword += (dword & 1) ;
if (dword > SIGNED_SIZEOF (psf->u.cbuf))
if (dword < 1 || dword > SIGNED_SIZEOF (psf->u.cbuf))
{ psf_log_printf (psf, " *** %M : %d (too big)\n", chunk, dword) ;
return SFE_INTERNAL ;
psf_binheader_readf (psf, "j", dword) ;
break ;
} ;
cptr = psf->u.cbuf ;
psf_binheader_readf (psf, "b", cptr, dword) ;
bytesread += dword ;
cptr [dword - 1] = 0 ;
cptr [dword - 1] = 0 ;
psf_log_printf (psf, " %M : %d : %s\n", chunk, mark_id, cptr) ;
} ;
break ;