OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b76976
)
avformat/swfdec: check version and size during probing
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Nov 2013 11:44:02 +0000
(12:44 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Nov 2013 11:44:02 +0000
(12:44 +0100)
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/swfdec.c
patch
|
blob
|
history
diff --git
a/libavformat/swfdec.c
b/libavformat/swfdec.c
index
54e0f6d
..
aa6ce84
100644
(file)
--- a/
libavformat/swfdec.c
+++ b/
libavformat/swfdec.c
@@
-55,9
+55,12
@@
static int get_swf_tag(AVIOContext *pb, int *len_ptr)
static int swf_probe(AVProbeData *p)
{
+ if(p->buf_size < 15)
+ return 0;
+
/* check file header */
if ((p->buf[0] == 'F' || p->buf[0] == 'C') && p->buf[1] == 'W' &&
- p->buf[2] == 'S')
+ p->buf[2] == 'S'
&& p->buf[3] < 20
)
return AVPROBE_SCORE_MAX;
else
return 0;