avformat/mlvdec: Check avio_read()

Fixes: use-of-uninitialized-value Fixes: 383170476/clusterfuzz-testcase-minimized-ffmpeg_dem_MLV_fuzzer-4696002884337664

Michael Niedermayer committed 1 year ago

Commit bb854231 parent 53db3511 file · +4 −2Browse files

Unified · Split

@@ -82,13 +82,15 @@ static int check_file_header(AVIOContext *pb, uint64_t guid) · 81 unmodified lines
82	82	static void read_string(AVFormatContext avctx, AVIOContext pb, const char *tag, unsigned size)
83	83	{
84	84	char * value = av_malloc(size + 1);
	85	+ int ret;
	86	+
85	87	if (!value) {
86	88	avio_skip(pb, size);
87	89	return;
88	90	}
89	91
90		− avio_read(pb, value, size);
91		− if (!value[0]) {
	92	+ ret = avio_read(pb, value, size);
	93	+ if (ret != size \|\| !value[0]) {
92	94	av_free(value);
93	95	return;
94	96	}

Keyboard shortcuts