avfilter/vf_lut3d: Check av_scanf()

Fixes: CID1604398 Unchecked return value Fixes: CID1604542 Unchecked return value

Michael Niedermayer committed 2 years ago

Commit ace2e251 parent 64aa2331 file · +6 −3Browse files

Unified · Split

@@ -703,7 +703,8 @@ try_again: · 702 unmodified lines
703	703	else if (!strncmp(line + 7, "MAX ", 4)) vals = max;
704	704	if (!vals)
705	705	return AVERROR_INVALIDDATA;
706		− av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2);
	706	+ if (av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2) != 3)
	707	+ return AVERROR_INVALIDDATA;
707	708	av_log(ctx, AV_LOG_DEBUG, "min: %f %f %f \| max: %f %f %f\n",
708	709	min[0], min[1], min[2], max[0], max[1], max[2]);
709	710	goto try_again;
@@ -1734,12 +1735,14 @@ try_again: · 1024 unmodified lines
1734	1735	else if (!strncmp(line + 7, "MAX ", 4)) vals = max;
1735	1736	if (!vals)
1736	1737	return AVERROR_INVALIDDATA;
1737		− av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2);
	1738	+ if (av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2) != 3)
	1739	+ return AVERROR_INVALIDDATA;
1738	1740	av_log(ctx, AV_LOG_DEBUG, "min: %f %f %f \| max: %f %f %f\n",
1739	1741	min[0], min[1], min[2], max[0], max[1], max[2]);
1740	1742	goto try_again;
1741	1743	} else if (!strncmp(line, "LUT_1D_INPUT_RANGE ", 19)) {
1742		− av_sscanf(line + 19, "%f %f", min, max);
	1744	+ if (av_sscanf(line + 19, "%f %f", min, max) != 2)
	1745	+ return AVERROR_INVALIDDATA;
1743	1746	min[1] = min[2] = min[0];
1744	1747	max[1] = max[2] = max[0];
1745	1748	goto try_again;

Keyboard shortcuts