Message ID | 20200325104548.28367-2-lance.lmwang@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [FFmpeg-devel,v1,1/2] avfilter/vf_showinfo: check if the s12m data size is valid | expand |
Context | Check | Description |
---|---|---|
andriy/ffmpeg-patchwork | success | Make fate finished |
On Wed, Mar 25, 2020 at 06:45:48PM +0800, lance.lmwang@gmail.com wrote: > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavfilter/vf_showinfo.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) will apply thx [...]
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 71534d1fa8..b0b0051357 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -318,14 +318,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) break; case AV_FRAME_DATA_S12M_TIMECODE: { uint32_t *tc = (uint32_t*)sd->data; + int m = FFMIN(tc[0],3); if (sd->size != 16) { av_log(ctx, AV_LOG_ERROR, "invalid data"); break; } - for (int j = 1; j <= tc[0]; j++) { + for (int j = 1; j <= m; j++) { char tcbuf[AV_TIMECODE_STR_SIZE]; av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0); - av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != tc[0] ? ", " : ""); + av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != m ? ", " : ""); } break; }