diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-04-13 15:56:54 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-04-17 12:20:12 +0200 |
| commit | 1e413487bf8ff413796d1cf1d9adafcd36f04444 (patch) | |
| tree | 500fc448ce6354041e4d2d9c811383db35b43355 | |
| parent | c36f69d7e357b9043396d325debdfed6d49e5741 (diff) | |
| download | ffmpeg-1e413487bf8ff413796d1cf1d9adafcd36f04444.tar.gz | |
fftools/ffmpeg: avoid possible invalid reads with short -tag values
Fixes #10319 and #10309.
Based on 89c9a3ac3542c3684e511607d88b265bfa6aa64f.
| -rw-r--r-- | fftools/ffmpeg_opt.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 6e18a4a23e..0969b12e7f 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -898,8 +898,11 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st); if (codec_tag) { uint32_t tag = strtol(codec_tag, &next, 0); - if (*next) - tag = AV_RL32(codec_tag); + if (*next) { + uint8_t buf[4] = { 0 }; + memcpy(buf, codec_tag, FFMIN(sizeof(buf), strlen(codec_tag))); + tag = AV_RL32(buf); + } st->codecpar->codec_tag = tag; } @@ -1660,8 +1663,11 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st); if (codec_tag) { uint32_t tag = strtol(codec_tag, &next, 0); - if (*next) - tag = AV_RL32(codec_tag); + if (*next) { + uint8_t buf[4] = { 0 }; + memcpy(buf, codec_tag, FFMIN(sizeof(buf), strlen(codec_tag))); + tag = AV_RL32(buf); + } ost->st->codecpar->codec_tag = ost->enc_ctx->codec_tag = tag; } |