Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: patches/to_upstream/21_vorbis_overflow.patch

Issue 5964011: Fix a couple of errors with bad Vorbis headers, and go through the associated... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « README.chromium ('k') | source/patched-ffmpeg-mt/libavcodec/vorbis_dec.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/to_upstream/21_vorbis_overflow.patch
===================================================================
--- patches/to_upstream/21_vorbis_overflow.patch (revision 0)
+++ patches/to_upstream/21_vorbis_overflow.patch (revision 0)
@@ -0,0 +1,25 @@
+diff -wurp -N orig/libavcodec/vorbis_dec.c ffmpeg-mt/libavcodec/vorbis_dec.c
+--- orig/libavcodec/vorbis_dec.c 2010-12-27 11:16:48.320721968 -0800
++++ ffmpeg-mt/libavcodec/vorbis_dec.c 2010-12-27 11:55:33.241708823 -0800
+@@ -536,6 +536,12 @@ static int vorbis_parse_setup_hdr_floors
+ rangebits = get_bits(gb, 4);
+ floor_setup->data.t1.list[0].x = 0;
+ floor_setup->data.t1.list[1].x = (1 << rangebits);
++ if (floor_setup->data.t1.list[1].x > vc->blocksize[1] / 2) {
++ av_log(vc->avccontext, AV_LOG_ERROR,
++ "Floor value is too large for blocksize: %d (%d)\n",
++ floor_setup->data.t1.list[1].x, vc->blocksize[1] / 2);
++ return -1;
++ }
+
+ for (j = 0; j < floor_setup->data.t1.partitions; ++j) {
+ for (k = 0; k < floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]]; ++k, ++floor1_values) {
+@@ -653,7 +659,7 @@ static int vorbis_parse_setup_hdr_residu
+ res_setup->partition_size = get_bits(gb, 24) + 1;
+ /* Validations to prevent a buffer overflow later. */
+ if (res_setup->begin>res_setup->end ||
+- res_setup->end > vc->avccontext->channels * vc->blocksize[1] / (res_setup->type == 2 ? 1 : 2) ||
++ res_setup->end > vc->avccontext->channels * vc->blocksize[1] / 2 ||
+ (res_setup->end-res_setup->begin) / res_setup->partition_size > V_MAX_PARTITIONS) {
+ av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %u, %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1] / 2);
+ return -1;
« no previous file with comments | « README.chromium ('k') | source/patched-ffmpeg-mt/libavcodec/vorbis_dec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698