diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-06-05 19:54:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-09 13:54:52 +0200 |
commit | 5625dc1f3234020cddf3e7217ecc455249f3f647 (patch) | |
tree | 1e6a1ef14c7b57099ebb78a29de86b6403f401f4 | |
parent | d9c4cfba9f3d8634cfb9ecbc33a7771871885c01 (diff) | |
download | ffmpeg-5625dc1f3234020cddf3e7217ecc455249f3f647.tar.gz |
avfilter/vf_ciescope: Fix undefined behavior in rgb_to_xy() with black
Fixes: floating point division by 0
Fixes: undefined behavior in handling NaN
Fixes: Ticket 8268
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3d500e62f6206ad11308b18976246366aed8c1a5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavfilter/vf_ciescope.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c index 7c0cfed061..311696817d 100644 --- a/libavfilter/vf_ciescope.c +++ b/libavfilter/vf_ciescope.c @@ -842,7 +842,8 @@ rgb_to_xy(double rc, *z = m[2][0] * rc + m[2][1] * gc + m[2][2] * bc; sum = *x + *y + *z; - + if (sum == 0) + sum = 1; *x = *x / sum; *y = *y / sum; } |