libtiff/backport-CVE-2023-26966.patch
zhangpan 33aedfc39a fix CVE-2023-25433 CVE-2023-26966 CVE-2023-2908
(cherry picked from commit 0d12c7405e6fdf03b8344f2e4ac437a07a9ea00e)
2023-07-04 17:10:18 +08:00

38 lines
872 B
Diff

From b0e1c25dd1d065200c8d8f59ad0afe014861a1b9 Mon Sep 17 00:00:00 2001
From: Su_Laus <sulau@freenet.de>
Date: Thu, 16 Feb 2023 12:03:16 +0100
Subject: [PATCH] tif_luv: Check and correct for NaN data in uv_encode().
Closes #530
See merge request !473
Reference:https://gitlab.com/libtiff/libtiff/-/merge_requests/473/diffs
Conflict:Adaptation Context
---
libtiff/tif_luv.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c
index 13765ea..e511a46 100644
--- a/libtiff/tif_luv.c
+++ b/libtiff/tif_luv.c
@@ -908,6 +908,13 @@ uv_encode(double u, double v, int em) /* encode (u',v') coordinates */
{
register int vi, ui;
+ /* check for NaN */
+ if (u != u || v != v)
+ {
+ u = U_NEU;
+ v = V_NEU;
+ }
+
if (v < UV_VSTART)
return oog_encode(u, v);
vi = tiff_itrunc((v - UV_VSTART)*(1./UV_SQSIZ), em);
--
2.27.0