patches/ugly/08_enforce_theora_oob.patch - Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/ugly/08_enforce_theora_oob.patch

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/

Patch Set: Created 10 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « patches/ugly/07_get_bits_overrun.patch ('k') | patches/ugly/09_enforce_vorbis_oob_divzero.patch » ('j') | no next file with comments »

OLD	NEW
1 diff -rpu -N orig/libavcodec/vp3.c ffmpeg-mt/libavcodec/vp3.c	1 diff -rpu -N orig/libavcodec/vp3.c ffmpeg-mt/libavcodec/vp3.c

2 --- orig/libavcodec/vp3.c» 2010-06-17 09:39:47.729307500 -0700	2 --- orig/libavcodec/vp3.c» 2010-06-24 19:19:47.029121600 -0700

3 +++ ffmpeg-mt/libavcodec/vp3.c» 2010-06-17 09:39:49.090443600 -0700	3 +++ ffmpeg-mt/libavcodec/vp3.c» 2010-06-24 19:19:48.932346000 -0700

4 @@ -868,6 +868,11 @@ static int unpack_vlcs(Vp3DecodeContext	4 @@ -868,6 +868,11 @@ static int unpack_vlcs(Vp3DecodeContext

5 int num_coeffs = s->num_coded_frags[plane][coeff_index];	5 int num_coeffs = s->num_coded_frags[plane][coeff_index];

6 int16_t *dct_tokens = s->dct_tokens[plane][coeff_index];	6 int16_t *dct_tokens = s->dct_tokens[plane][coeff_index];

7	7

8 +#ifdef ALT_BITSTREAM_READER	8 +#ifdef ALT_BITSTREAM_READER

9 + if (gb->buffer_exhausted && gb->index > gb->size_in_bits)	9 + if (gb->buffer_exhausted && gb->index > gb->size_in_bits)

10 + return 0;	10 + return 0;

11 +#endif	11 +#endif

12 +	12 +

13 /* local references to structure members to avoid repeated deferences */	13 /* local references to structure members to avoid repeated deferences */

(...skipping 20 matching lines...) Expand all Loading...
34 if (s->theora && get_bits1(&gb))	34 if (s->theora && get_bits1(&gb))

35 {	35 {

36 @@ -2285,6 +2296,7 @@ static av_cold int theora_decode_init(AV	36 @@ -2285,6 +2296,7 @@ static av_cold int theora_decode_init(AV

37	37

38 for(i=0;i<3;i++) {	38 for(i=0;i<3;i++) {

39 init_get_bits(&gb, header_start[i], header_len[i] * 8);	39 init_get_bits(&gb, header_start[i], header_len[i] * 8);

40 + gb.buffer_enforcing = 1;	40 + gb.buffer_enforcing = 1;

41	41

42 ptype = get_bits(&gb, 8);	42 ptype = get_bits(&gb, 8);

43	43

OLD	NEW