| Message ID | 20200614223656.21338-26-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | ff3fad6b0edb13dd664403b01bc00309f035b110 |
| Headers | show |
| Series | [FFmpeg-devel,01/26] avformat/matroskadec: Move AVBufferRef instead of copying, fix memleak | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
diff --git a/libavformat/mov.c b/libavformat/mov.c index a59c804d16..4e68532b69 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2342,7 +2342,7 @@ FF_ENABLE_DEPRECATION_WARNINGS uint32_t format = AV_RB32(st->codecpar->extradata + 22); if (format == AV_RB32("name") && (int64_t)size >= (int64_t)len + 18) { uint16_t str_size = AV_RB16(st->codecpar->extradata + 26); /* string length */ - if (str_size > 0 && size >= (int)str_size + 26) { + if (str_size > 0 && size >= (int)str_size + 30) { char *reel_name = av_malloc(str_size + 1); if (!reel_name) return AVERROR(ENOMEM);
Only read str_size bytes from offset 30 of extradata if the extradata is indeed at least 30 + str_size bytes long. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- Honestly I don't know the spec describing the actual layout of the reel_name tag, but looking at this code as well as the one in movenc makes it clear that the check is wrong. libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)