~ubuntu-branches/ubuntu/raring/libav/raring-security

« back to all changes in this revision

Viewing changes to debian/patches/post-0.7.1/0021-Do-not-decode-RV30-files-if-the-extradata-is-too-sma.patch

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-09-28 09:18:34 UTC
  • mfrom: (1.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20110928091834-w415mnuh06h4zpvc
Tags: 4:0.7.1-7ubuntu2
Revert "Convert package to include multiarch support."

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From 3ed12b97bed7f0cd430c4304f166e549b4dad634 Mon Sep 17 00:00:00 2001
 
2
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@gmail.com>
 
3
Date: Sat, 16 Jul 2011 11:41:08 -0400
 
4
Subject: [PATCH 21/70] Do not decode RV30 files if the extradata is too small
 
5
 
 
6
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 
7
(cherry picked from commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac)
 
8
 
 
9
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 
10
---
 
11
 libavcodec/rv30.c |    1 +
 
12
 1 files changed, 1 insertions(+), 0 deletions(-)
 
13
 
 
14
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
 
15
index 62177dd..2b423cc 100644
 
16
--- a/libavcodec/rv30.c
 
17
+++ b/libavcodec/rv30.c
 
18
@@ -256,6 +256,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx)
 
19
     if(avctx->extradata_size - 8 < (r->rpr - 1) * 2){
 
20
         av_log(avctx, AV_LOG_ERROR, "Insufficient extradata - need at least %d bytes, got %d\n",
 
21
                6 + r->rpr * 2, avctx->extradata_size);
 
22
+        return EINVAL;
 
23
     }
 
24
     r->parse_slice_header = rv30_parse_slice_header;
 
25
     r->decode_intra_types = rv30_decode_intra_types;
 
26
-- 
 
27
1.7.4.1
 
28