Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'

* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f': graphparser: Check av_get_token() memory error

Michael Niedermayer committed 11 years ago

Commit 9d5017a2 parents a4cd057 9d3b7521 file · +2 −0Browse files

Showing the changes to libavfilter/graphparser.c (1 of 1 file). Show all

Unified · Split

@@ -62,6 +62,8 @@ static char parse_link_name(const char buf, void log_ctx) · 61 unmodified lines
62	62	(*buf)++;
63	63
64	64	name = av_get_token(buf, "]");
	65	+ if (!name)
	66	+ goto fail;
65	67
66	68	if (!name[0]) {
67	69	av_log(log_ctx, AV_LOG_ERROR,

Keyboard shortcuts