diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-06-08 22:30:24 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-06-09 10:53:51 +0100 |
| commit | 346c5b0ebf58c81f657540eeb72abaa41bfc4e3f (patch) | |
| tree | 533748474e06c4d9fff4f35993fd0a6c53bc2f18 | |
| parent | 7c020a14802255c966b2b402b983551b86a08bba (diff) | |
| download | libguestfs-346c5b0ebf58c81f657540eeb72abaa41bfc4e3f.tar.gz libguestfs-346c5b0ebf58c81f657540eeb72abaa41bfc4e3f.tar.xz libguestfs-346c5b0ebf58c81f657540eeb72abaa41bfc4e3f.zip | |
Coverity: Ensure fp is closed along all error paths.
| -rw-r--r-- | daemon/inotify.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/daemon/inotify.c b/daemon/inotify.c index 8e8b690f..c8862e55 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 |