From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 8 Jun 2011 21:30:24 +0000 (+0100)
Subject: Coverity: Ensure fp is closed along all error paths.
X-Git-Tag: 1.8.8~4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=7273f8f271cf418fc2acc7c48c383b814ed0e3a9;p=libguestfs.git

Coverity: Ensure fp is closed along all error paths.
(cherry picked from commit 346c5b0ebf58c81f657540eeb72abaa41bfc4e3f)
---

diff --git a/daemon/inotify.c b/daemon/inotify.c
index 8e8b690..c8862e5 100644
--- a/daemon/inotify.c
+++ b/daemon/inotify.c
@@ -314,7 +314,7 @@ do_inotify_files (void)
   char **ret = NULL;
   int size = 0, alloc = 0;
   unsigned int i;
-  FILE *fp;
+  FILE *fp = NULL;
   guestfs_int_inotify_event_list *events;
   char buf[PATH_MAX];
 
@@ -361,13 +361,12 @@ do_inotify_files (void)
     if (len > 0 && buf[len-1] == '\n')
       buf[len-1] = '\0';
 
-    if (add_string (&ret, &size, &alloc, buf) == -1) {
-      fclose (fp);
+    if (add_string (&ret, &size, &alloc, buf) == -1)
       goto error;
-    }
   }
 
   fclose (fp);
+  fp = NULL;
 
   if (add_string (&ret, &size, &alloc, NULL) == -1)
     goto error;
@@ -376,6 +375,9 @@ do_inotify_files (void)
   return ret;
 
  error:
+  if (fp != NULL)
+    fclose (fp);
+
   unlink ("/tmp/inotify");
   return NULL;
 #else