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:
71bc8c9
)
ffmdec: fix hypothetical overflows
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 17 Oct 2012 18:36:30 +0000
(20:36 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 17 Oct 2012 18:36:30 +0000
(20:36 +0200)
Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/ffmdec.c
patch
|
blob
|
history
diff --git
a/libavformat/ffmdec.c
b/libavformat/ffmdec.c
index
66306bf
..
d4e6056
100644
(file)
--- a/
libavformat/ffmdec.c
+++ b/
libavformat/ffmdec.c
@@
-111,8
+111,8
@@
static int ffm_read_data(AVFormatContext *s,
if (ffm->first_packet || (frame_offset & 0x8000)) {
if (!frame_offset) {
/* This packet has no frame headers in it */
- if (avio_tell(pb) >= ffm->packet_size * 3) {
- avio_seek(pb, -ffm->packet_size * 2, SEEK_CUR);
+ if (avio_tell(pb) >= ffm->packet_size * 3
LL
) {
+ avio_seek(pb, -ffm->packet_size * 2
LL
, SEEK_CUR);
goto retry_read;
}
/* This is bad, we cannot find a valid frame header */