OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0335486
)
Check buffer size for idcin check, otherwise false positives are too likely for
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Mon, 14 Sep 2009 15:44:05 +0000
(15:44 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Mon, 14 Sep 2009 15:44:05 +0000
(15:44 +0000)
small probe buffer sizes due to 0-padding (see probetest results).
Originally committed as revision 19838 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/idcin.c
patch
|
blob
|
history
diff --git
a/libavformat/idcin.c
b/libavformat/idcin.c
index
0a5f825
..
8e9dfb5
100644
(file)
--- a/
libavformat/idcin.c
+++ b/
libavformat/idcin.c
@@
-105,6
+105,11
@@
static int idcin_probe(AVProbeData *p)
* audio channels: 0 for no audio, or 1 or 2
*/
+ /* check we have enough data to do all checks, otherwise the
+ 0-padding may cause a wrong recognition */
+ if (p->buf_size < 20)
+ return 0;
+
/* check the video width */
number = AV_RL32(&p->buf[0]);
if ((number == 0) || (number > 1024))