From 8c0859a80444c90b8dfb862a9f16de74e16f0a9e Mon Sep 17 00:00:00 2001 From: xiaoxiaoafeifei Date: Fri, 21 Apr 2023 13:01:34 +0000 Subject: [PATCH] countInkNamesString(): fix `UndefinedBehaviorSanitizer`: applying zero offset to null pointer Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/9bd48f0dbd64fb94dc2b5b05238fde0bfdd4ff3f] CVE: CVE-2023-2908 Signed-off-by: Hitendra Prajapati --- libtiff/tif_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 9d8267a..6389b40 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -145,10 +145,10 @@ static uint16 countInkNamesString(TIFF *tif, uint32 slen, const char *s) { uint16 i = 0; - const char *ep = s + slen; - const char *cp = s; if (slen > 0) { + const char *ep = s + slen; + const char *cp = s; do { for (; cp < ep && *cp != '\0'; cp++) {} if (cp >= ep) -- 2.25.1