generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

Browse Source 
* commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
	tools/qt-faststart.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-21 13:32:22 +02:00
parent c6f2ad9f94 cb95c1935f
commit c40631baf7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/qt-faststart.c
View File

@@ -235,8 +235,8 @@ int main(int argc, char *argv[])
goto error_out; goto error_out;
} }
offset_count = BE_32(&moov_atom[i + 8]); offset_count = BE_32(&moov_atom[i + 8]);
if (i + 12LL + offset_count * 4LL > moov_atom_size) { if (i + 12 + offset_count * UINT64_C(4) > moov_atom_size) {
printf(" bad atom size\n"); printf(" bad atom size/element count\n");
goto error_out; goto error_out;
} }
for (j = 0; j < offset_count; j++) { for (j = 0; j < offset_count; j++) {
@@ -256,8 +256,8 @@ int main(int argc, char *argv[])
goto error_out; goto error_out;
} }
offset_count = BE_32(&moov_atom[i + 8]); offset_count = BE_32(&moov_atom[i + 8]);
if (i + 12LL + offset_count * 8LL > moov_atom_size) { if (i + 12 + offset_count * UINT64_C(8) > moov_atom_size) {
printf(" bad atom size\n"); printf(" bad atom size/element count\n");
goto error_out; goto error_out;
} }
for (j = 0; j < offset_count; j++) { for (j = 0; j < offset_count; j++) {