RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-25 04:19:05 +00:00
Code Issues Projects Releases Wiki Activity

lavf/wav: Print an error if files >4G are written.

Browse Source 
Additionally, don't write an incorrect shorter size for such files.

Fixes part of ticket #4543.
This commit is contained in:
Carl Eugen Hoyos 2015-05-16 23:32:56 +02:00
parent 101f26e758
commit 2608f11863
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/wavenc.c
View File

@ -425,7 +425,7 @@ static int wav_write_trailer(AVFormatContext *s)
avio_flush(pb); avio_flush(pb);
if (s->pb->seekable) { if (s->pb->seekable) {
if (wav->write_peak != 2) { if (wav->write_peak != 2 && avio_tell(pb) - wav->data < UINT32_MAX) {
ff_end_tag(pb, wav->data); ff_end_tag(pb, wav->data);
avio_flush(pb); avio_flush(pb);
} }
@ -440,12 +440,16 @@ static int wav_write_trailer(AVFormatContext *s)
data_size = file_size - wav->data; data_size = file_size - wav->data;
if (wav->rf64 == RF64_ALWAYS || (wav->rf64 == RF64_AUTO && file_size - 8 > UINT32_MAX)) { if (wav->rf64 == RF64_ALWAYS || (wav->rf64 == RF64_AUTO && file_size - 8 > UINT32_MAX)) {
rf64 = 1; rf64 = 1;
} else { } else if (file_size - 8 <= UINT32_MAX) {
avio_seek(pb, 4, SEEK_SET); avio_seek(pb, 4, SEEK_SET);
avio_wl32(pb, (uint32_t)(file_size - 8)); avio_wl32(pb, (uint32_t)(file_size - 8));
avio_seek(pb, file_size, SEEK_SET); avio_seek(pb, file_size, SEEK_SET);
avio_flush(pb); avio_flush(pb);
} else {
av_log(s, AV_LOG_ERROR,
"Filesize %"PRId64" invalid for wav, output file will be broken\n",
file_size);
} }
number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration, number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration,