From 07585189cf2fbe0184b4d60ce9440b10f575d4a2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 Jan 2021 10:09:21 +0000
Subject: [PATCH] lib: Ignore a bunch of bogus GCC 11 warnings.

-Werror=analyzer-file-leak doesn't follow CLEANUP_FCLOSE properly.

yara.c:64:24: error: leak of FILE '<unknown>' [CWE-775] [-Werror=analyzer-file-leak]
   64 |   CLEANUP_FCLOSE FILE *fp = NULL;
      |                        ^~
---
 lib/tsk.c  | 3 +++
 lib/yara.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lib/tsk.c b/lib/tsk.c
index cb1dc94ec..fa7a4728f 100644
--- a/lib/tsk.c
+++ b/lib/tsk.c
@@ -71,6 +71,8 @@ guestfs_impl_find_inode (guestfs_h *g, const char *mountable, int64_t inode)
   return parse_dirent_file (g, tmpfile);  /* caller frees */
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-file-leak"
 /* Parse the file content and return dirents list.
  * Return a list of tsk_dirent on success, NULL on error.
  */
@@ -101,6 +103,7 @@ parse_dirent_file (guestfs_h *g, const char *tmpfile)
 
   return dirents;
 }
+#pragma GCC diagnostic pop
 
 /* Deserialise the file content and populate the dirent list.
  * Return the number of deserialised dirents, -1 on error.
diff --git a/lib/yara.c b/lib/yara.c
index 27390d153..775202195 100644
--- a/lib/yara.c
+++ b/lib/yara.c
@@ -54,6 +54,8 @@ guestfs_impl_yara_scan (guestfs_h *g, const char *path)
   return parse_yara_detection_file (g, tmpfile);  /* caller frees */
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-file-leak"
 /* Parse the file content and return detections list.
  * Return a list of yara_detection on success, NULL on error.
  */
@@ -86,6 +88,7 @@ parse_yara_detection_file (guestfs_h *g, const char *tmpfile)
 
   return detections;
 }
+#pragma GCC diagnostic pop
 
 /* Deserialise the file content and populate the detection list.
  * Return the number of deserialised detections, -1 on error.