avfilter/vf_scale: Check ff_scale_adjust_dimensions() for failure

Helps: CID1513722 Operands don't affect result

Michael Niedermayer committed 2 years ago

Commit 2a8fb3c1 parent ad9df8b1 file · +4 −1Browse files

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

Unified · Split

@@ -638,10 +638,13 @@ static int config_props(AVFilterLink *outlink) · 637 unmodified lines
638	638	outlink->w = scale->w;
639	639	outlink->h = scale->h;
640	640
641		− ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h,
	641	+ ret = ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h,
642	642	scale->force_original_aspect_ratio,
643	643	scale->force_divisible_by);
644	644
	645	+ if (ret < 0)
	646	+ goto fail;
	647	+
645	648	if (outlink->w > INT_MAX \|\|
646	649	outlink->h > INT_MAX \|\|
647	650	(outlink->h * inlink->w) > INT_MAX \|\|

Keyboard shortcuts