- MOV: fix crash when 'meta' occurs before first 'trak'; backport from git

  (my testfile: Haabersti.MP4, issue 36491)
- rel 7

Changed files:
    ffmpeg.spec -> 1.193.2.8
    meta-before-track.patch -> 1.1.2.1

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 19fb1fd06f42e5fc9a36cc607f2fa5c9a6a4cf65..816eb578febd11826fcf67bf1adffe8906367f01 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -10,7 +10,7 @@ Summary:      FFmpeg is a very fast video and audio converter
 Summary(pl.UTF-8):     Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:          ffmpeg
 Version:       0.5.2
-Release:       6
+Release:       7
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, ac3, xvid, x264, faad)
 License:       GPL v3+ with LGPL v3+ parts
@@ -23,6 +23,7 @@ Source3:      ffserver.conf
 Patch0:                %{name}-bug-803.patch
 Patch1:                imagewidth.patch
 Patch2:                faadbin-libfaadname.patch
+Patch3:                meta-before-track.patch
 URL:           http://www.ffmpeg.org/
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel >= 1.0.16
@@ -211,6 +212,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig

diff --git a/meta-before-track.patch b/meta-before-track.patch
new file mode 100644 (file)
index 0000000..a37b0de
--- /dev/null
+++ b/meta-before-track.patch
@@ -0,0 +1,32 @@
+From: alexc <alexc@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
+Date: Tue, 3 Mar 2009 18:19:44 +0000 (+0000)
+Subject: MOV: fix crash when 'meta' occurs before first 'trak'
+X-Git-Url: http://git.ffmpeg.org/?p=ffmpeg;a=commitdiff_plain;h=b3f3355dc645ecea3326b67940925876075337a7
+
+MOV: fix crash when 'meta' occurs before first 'trak'
+
+
+git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17781 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
+---
+
+diff --git a/libavformat/mov.c b/libavformat/mov.c
+index b34326c..88f8003 100644
+--- a/libavformat/mov.c
++++ b/libavformat/mov.c
+@@ -308,10 +308,15 @@ static int mov_read_dref(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
+ 
+ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
+ {
+-    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
++    AVStream *st;
+     uint32_t type;
+     uint32_t ctype;
+ 
++    if (c->fc->nb_streams < 1) // meta before first trak
++        return 0;
++
++    st = c->fc->streams[c->fc->nb_streams-1];
++
+     get_byte(pb); /* version */
+     get_be24(pb); /* flags */
+