From f3e3f1f86a8a6c1d02b5e87907110747978c62fc Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 25 May 2018 10:18:34 -0400 Subject: [PATCH] lib-fs: fs_file_deinit(NULL) should be a no-op --- src/lib-fs/fs-api.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c index b2aeaaa088..8d92994f31 100644 --- a/src/lib-fs/fs-api.c +++ b/src/lib-fs/fs-api.c @@ -279,8 +279,14 @@ struct fs_file *fs_file_init_with_event(struct fs *fs, struct event *event, void fs_file_deinit(struct fs_file **_file) { struct fs_file *file = *_file; - struct event *event = file->event; - pool_t metadata_pool = file->metadata_pool; + struct event *event; + pool_t metadata_pool; + + if (file == NULL) + return; + + event = file->event; + metadata_pool = file->metadata_pool; i_assert(file->fs->files_open_count > 0);