aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/wtvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-02 22:36:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-02 22:36:15 +0100
commitec79b1fc88b2cc6a9ab6cd953efcdbaebedde233 (patch)
tree4b040980c2dffe7f91c2912f91c4b3305ad7824b /libavformat/wtvdec.c
parent80aa89bdff6e3e9dd6bc58d806db0cbe99403149 (diff)
downloadffmpeg-ec79b1fc88b2cc6a9ab6cd953efcdbaebedde233.tar.gz
wtvdec: fix null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtvdec.c')
-rw-r--r--libavformat/wtvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index c3f57504e9..070614536c 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -763,7 +763,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
}
} else if (!ff_guidcmp(g, ff_stream2_guid)) {
int stream_index = ff_find_stream_index(s, sid);
- if (stream_index >= 0 && !((WtvStream*)s->streams[stream_index]->priv_data)->seen_data) {
+ if (stream_index >= 0 && s->streams[stream_index]->priv_data && !((WtvStream*)s->streams[stream_index]->priv_data)->seen_data) {
ff_asf_guid mediatype, subtype, formattype;
int size;
avio_skip(pb, 12);