libtiff: Merge branch 'Writing_IFD8_to_ClassicTIFF_bugfix' into 'master'

From 27a45b790ec9e2746f524f51483bb5eedfbd6964 Mon Sep 17 00:00:00 2001
From: Su Laus <[EMAIL REDACTED]>
Date: Tue, 9 Aug 2022 19:59:23 +0000
Subject: [PATCH] Correcting defects reported by Coverity Scan for MR !369

---
 libtiff/tif_dir.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
index ce3e2297..3675b35d 100644
--- a/libtiff/tif_dir.c
+++ b/libtiff/tif_dir.c
@@ -660,7 +660,7 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap)
 							if (pui64[i] > 0xffffffffu) {
 								TIFFErrorExt(tif->tif_clientdata, module,
 									"%s: Bad LONG8 value %"PRIu64" at %d. array position for \"%s\" tag %d in ClassicTIFF. Tag won't be written to file",
-									tif->tif_name, pui64[i], i, fip ? fip->field_name : "Unknown", tag);
+									tif->tif_name, pui64[i], i, fip->field_name, tag);
 								goto badvalueifd8long8;
 							}
 						}
@@ -670,7 +670,7 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap)
 							if (pi64[i] > 2147483647 || pi64[i] < (-2147483647 - 1)) {
 								TIFFErrorExt(tif->tif_clientdata, module,
 									"%s: Bad SLONG8 value %"PRIi64" at %d. array position for \"%s\" tag %d in ClassicTIFF. Tag won't be written to file",
-									tif->tif_name, pi64[i], i, fip ? fip->field_name : "Unknown", tag);
+									tif->tif_name, pi64[i], i, fip->field_name, tag);
 								goto badvalueifd8long8;
 							}
 						}
@@ -728,7 +728,7 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap)
 						if (!(tif->tif_flags & TIFF_BIGTIFF) && (v2 > 0xffffffffu)) {
 							TIFFErrorExt(tif->tif_clientdata, module,
 								"%s: Bad LONG8 or IFD8 value %"PRIu64" for \"%s\" tag %d in ClassicTIFF. Tag won't be written to file",
-								tif->tif_name, v2, fip ? fip->field_name : "Unknown", tag);
+								tif->tif_name, v2, fip->field_name, tag);
 							goto badvalueifd8long8;
 						}
 					}
@@ -741,7 +741,7 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap)
 						if (!(tif->tif_flags & TIFF_BIGTIFF) && ((v2 > 2147483647) || (v2 < (-2147483647 - 1)))) {
 							TIFFErrorExt(tif->tif_clientdata, module,
 								"%s: Bad SLONG8 value %"PRIi64" for \"%s\" tag %d in ClassicTIFF. Tag won't be written to file",
-								tif->tif_name, v2, fip ? fip->field_name : "Unknown", tag);
+								tif->tif_name, v2, fip->field_name, tag);
 								goto badvalueifd8long8;
 						}
 					}