← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/post-0.7.1/0065-rv34-Avoid-NULL-dereference-on-corrupted-bitstream.patch

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-10-01 00:22:07 UTC
  • mfrom: (1.3.8 sid)
  • Revision ID: package-import@ubuntu.com-20111001002207-tnxz39i0rwr5ufy9
Tags: 4:0.7.2-1ubuntu1
* Merge from debian, remaining changes:
  - don't build against libfaad, libdirac, librtmp and libopenjpeg,
    lame, xvid, x264  (all in universe)
  - not installing into multiarch directories
* This new upstream release has basically merged in all 70 patches that
  are present in 4:0.7.1-7ubuntu2, plus some additional, similarily
  focused ones.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/post-0.7.1/0065-rv34-Avoid-NULL-dereference-on-corrupted-bitstream.patch
1
 
From f0bcba238a540793adc514fb84e74282b04d2418 Mon Sep 17 00:00:00 2001
2
 
From: Laurent Aimar <fenrir@videolan.org>
3
 
Date: Sat, 17 Sep 2011 23:43:58 +0200
4
 
Subject: [PATCH 65/70] rv34: Avoid NULL dereference on corrupted bitstream
5
 
MIME-Version: 1.0
6
 
Content-Type: text/plain; charset=UTF-8
7
 
Content-Transfer-Encoding: 8bit
8
 
 
9
 
rv34_decode_slice() can return without allocating any pictures.
10
 
 
11
 
Signed-off-by: Martin Storsjö <martin@martin.st>
12
 
(cherry picked from commit d0f6ab0298f2309c6104626787ed73416298b019)
13
 
 
14
 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
15
 
---
16
 
 libavcodec/rv34.c |    2 +-
17
 
 1 files changed, 1 insertions(+), 1 deletions(-)
18
 
 
19
 
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
20
 
index 910b933..2383903 100644
21
 
--- a/libavcodec/rv34.c
22
 
+++ b/libavcodec/rv34.c
23
 
@@ -1486,7 +1486,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
24
 
             break;
25
 
     }
26
 
 
27
 
-    if(last){
28
 
+    if(last && s->current_picture_ptr){
29
 
         if(r->loop_filter)
30
 
             r->loop_filter(r, s->mb_height - 1);
31
 
         ff_er_frame_end(s);
32
 
1.7.4.1
33