Browse code
avformat/movenc: Check input sample count
Fixes: division by 0
Fixes: fpe_movenc.c_199_1.wav
Fixes: fpe_movenc.c_199_2.wav
Fixes: fpe_movenc.c_199_3.wav
Fixes: fpe_movenc.c_199_4.wav
Fixes: fpe_movenc.c_199_5.wav
Fixes: fpe_movenc.c_199_6.wav
Fixes: fpe_movenc.c_199_7.wav
Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3a2d21bc5f97aa0161db3ae731fc2732be6108b8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer authored on 2018/07/07 05:23:25Showing 1 changed files
| ... | ... |
@@ -5215,6 +5215,11 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) |
| 5215 | 5215 |
else |
| 5216 | 5216 |
samples_in_chunk = 1; |
| 5217 | 5217 |
|
| 5218 |
+ if (samples_in_chunk < 1) {
|
|
| 5219 |
+ av_log(s, AV_LOG_ERROR, "fatal error, input packet contains no samples\n"); |
|
| 5220 |
+ return AVERROR_PATCHWELCOME; |
|
| 5221 |
+ } |
|
| 5222 |
+ |
|
| 5218 | 5223 |
/* copy extradata if it exists */ |
| 5219 | 5224 |
if (trk->vos_len == 0 && par->extradata_size > 0 && |
| 5220 | 5225 |
!TAG_IS_AVCI(trk->tag) && |