diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 22:20:26 +0100 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-03-06 15:28:00 -0800 |
| commit | ffdc41f0395f74cb8844361d2154784ce65e8fdd (patch) | |
| tree | a80d0dc67b2a2c220b2296b80b5c79bfdbabbd61 | |
| parent | ca7e97bdcf0d19c69293de08f5956d1431ee461f (diff) | |
| download | ffmpeg-ffdc41f0395f74cb8844361d2154784ce65e8fdd.tar.gz | |
nsvdec: Fix use of uninitialized streams.
Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5c011706bc752d34bc6ada31d7df2ca0c9af7c6b)
Signed-off-by: Alex Converse <alex.converse@gmail.com>
(cherry picked from commit 6a89b41d9780325ba6d89a37f2aeb925aa68e6a3)
| -rw-r--r-- | libavformat/nsvdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 18dfde2867..261cfbb1af 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -605,12 +605,12 @@ null_chunk_retry: } /* map back streams to v,a */ - if (s->streams[0]) + if (s->nb_streams > 0) st[s->streams[0]->id] = s->streams[0]; - if (s->streams[1]) + if (s->nb_streams > 1) st[s->streams[1]->id] = s->streams[1]; - if (vsize/* && st[NSV_ST_VIDEO]*/) { + if (vsize && st[NSV_ST_VIDEO]) { nst = st[NSV_ST_VIDEO]->priv_data; pkt = &nsv->ahead[NSV_ST_VIDEO]; av_get_packet(pb, pkt, vsize); @@ -623,7 +623,7 @@ null_chunk_retry: if(st[NSV_ST_VIDEO]) ((NSVStream*)st[NSV_ST_VIDEO]->priv_data)->frame_offset++; - if (asize/*st[NSV_ST_AUDIO]*/) { + if (asize && st[NSV_ST_AUDIO]) { nst = st[NSV_ST_AUDIO]->priv_data; pkt = &nsv->ahead[NSV_ST_AUDIO]; /* read raw audio specific header on the first audio chunk... */ |