RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-02 10:41:16 +00:00
Code Issues Projects Releases Wiki Activity

additional protection from segmentation faults and memory access errors by

Browse Source 
copying the input buffer to a local context buffer which is large enough to
hold the largest possible AC3 frame.

Originally committed as revision 12593 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-03-25 23:34:00 +00:00
parent 26759c4480
commit c33a196716
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/ac3dec.c
View File

@ -39,6 +39,9 @@
#include "dsputil.h" #include "dsputil.h"
#include "random.h" #include "random.h"
/** Maximum possible frame size when the specification limit is ignored */
#define AC3_MAX_FRAME_SIZE 21695
/** /**
* Table of bin locations for rematrixing bands * Table of bin locations for rematrixing bands
* reference: Section 7.5.2 Rematrixing : Frequency Band Definitions * reference: Section 7.5.2 Rematrixing : Frequency Band Definitions
@ -191,6 +194,7 @@ typedef struct {
GetBitContext gbc; ///< bitstream reader GetBitContext gbc; ///< bitstream reader
AVRandomState dith_state; ///< for dither generation AVRandomState dith_state; ///< for dither generation
AVCodecContext *avctx; ///< parent context AVCodecContext *avctx; ///< parent context
uint8_t input_buffer[AC3_MAX_FRAME_SIZE]; ///< temp buffer to prevent overread
} AC3DecodeContext; } AC3DecodeContext;
/** /**
@ -1133,7 +1137,14 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
int i, blk, ch, err; int i, blk, ch, err;
/* initialize the GetBitContext with the start of valid AC-3 Frame */ /* initialize the GetBitContext with the start of valid AC-3 Frame */
if(avctx->error_resilience >= FF_ER_CAREFUL) {
/* copy input buffer to decoder context to avoid reading past the end
of the buffer, which can be caused by a damaged input stream. */
memcpy(s->input_buffer, buf, FFMIN(buf_size, AC3_MAX_FRAME_SIZE));
init_get_bits(&s->gbc, s->input_buffer, buf_size * 8);
} else {
init_get_bits(&s->gbc, buf, buf_size * 8); init_get_bits(&s->gbc, buf, buf_size * 8);
}
/* parse the syncinfo */ /* parse the syncinfo */
err = ac3_parse_header(s); err = ac3_parse_header(s);