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:
ed68085
)
qt-faststart: check return of ftello()
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 24 Oct 2012 22:39:33 +0000
(
00:39
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 24 Oct 2012 23:32:45 +0000
(
01:32
+0200)
Fixes CID739863
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tools/qt-faststart.c
patch
|
blob
|
history
diff --git
a/tools/qt-faststart.c
b/tools/qt-faststart.c
index
80c5d4b
..
3e2acd5
100644
(file)
--- a/
tools/qt-faststart.c
+++ b/
tools/qt-faststart.c
@@
-137,11
+137,11
@@
int main(int argc, char *argv[])
goto error_out;
}
if ( fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR)
- || fread(ftyp_atom, atom_size, 1, infile) != 1) {
+ || fread(ftyp_atom, atom_size, 1, infile) != 1
+ || (start_offset = ftello(infile))<0) {
perror(argv[1]);
goto error_out;
}
- start_offset = ftello(infile);
} else {
int ret;
/* 64-bit special case */