patches/ugly/09_enforce_vorbis_oob_divzero.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/09_enforce_vorbis_oob_divzero.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/08_enforce_theora_oob.patch ('k') | patches/ugly/10_aac_oob_read.patch » ('j') | no next file with comments »

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

2 --- orig/libavcodec/vorbis_dec.c» 2010-06-17 09:39:54.695004000 -0700	2 --- orig/libavcodec/vorbis_dec.c» 2010-06-24 19:19:53.222401000 -0700

3 +++ ffmpeg-mt/libavcodec/vorbis_dec.c» 2010-06-17 09:39:57.227257200 -0700	3 +++ ffmpeg-mt/libavcodec/vorbis_dec.c» 2010-06-24 19:19:54.922822800 -0700

4 @@ -961,6 +961,7 @@ static av_cold int vorbis_decode_init(AV	4 @@ -961,6 +961,7 @@ static av_cold int vorbis_decode_init(AV

5 }	5 }

6	6

7 init_get_bits(gb, header_start[0], header_len[0]*8);	7 init_get_bits(gb, header_start[0], header_len[0]*8);

8 + gb->buffer_enforcing=1;	8 + gb->buffer_enforcing=1;

9 hdr_type = get_bits(gb, 8);	9 hdr_type = get_bits(gb, 8);

10 if (hdr_type != 1) {	10 if (hdr_type != 1) {

11 av_log(avccontext, AV_LOG_ERROR, "First header is not the id header.\n" );	11 av_log(avccontext, AV_LOG_ERROR, "First header is not the id header.\n" );

12 @@ -973,6 +974,7 @@ static av_cold int vorbis_decode_init(AV	12 @@ -973,6 +974,7 @@ static av_cold int vorbis_decode_init(AV

13 }	13 }

(...skipping 22 matching lines...) Expand all Loading...
36 uint_fast32_t inverse_class = ff_inverse[vr->classifications];	36 uint_fast32_t inverse_class = ff_inverse[vr->classifications];

37 for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {	37 for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {

38 @@ -1601,6 +1603,7 @@ static int vorbis_decode_frame(AVCodecCo	38 @@ -1601,6 +1603,7 @@ static int vorbis_decode_frame(AVCodecCo

39 AV_DEBUG("packet length %d \n", buf_size);	39 AV_DEBUG("packet length %d \n", buf_size);

40	40

41 init_get_bits(gb, buf, buf_size*8);	41 init_get_bits(gb, buf, buf_size*8);

42 + gb->buffer_enforcing=1;	42 + gb->buffer_enforcing=1;

43	43

44 len = vorbis_parse_audio_packet(vc);	44 len = vorbis_parse_audio_packet(vc);

45	45

OLD	NEW