projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d4cd3b
)
Fixes NULL pointer dereference CID66
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 28 May 2008 00:10:34 +0000
(
00:10
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 28 May 2008 00:10:34 +0000
(
00:10
+0000)
Originally committed as revision 13483 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index
a84acf8
..
06576c3
100644
(file)
--- a/
libavformat/avidec.c
+++ b/
libavformat/avidec.c
@@
-650,6
+650,9
@@
static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
best_stream_index= i;
}
}
+ if(!best_st)
+ return -1;
+
best_ast = best_st->priv_data;
best_ts= av_rescale(best_ts, best_st->time_base.den, AV_TIME_BASE * (int64_t)best_st->time_base.num); //FIXME a little ugly
if(best_ast->remaining)