diff --git a/src/sys/security.c b/src/sys/security.c
index f05162d2..460ce6db 100644
--- a/src/sys/security.c
+++ b/src/sys/security.c
@@ -310,6 +310,7 @@ NTSTATUS FspFsvolSetSecurityComplete(
     FspFileNodeReleaseOwner(FileNode, Full, Request);
 
     Irp->IoStatus.Information = 0;
+    Result = STATUS_SUCCESS;
 
     FSP_LEAVE_IOC("FileObject=%p, SecurityInformation=%x",
         IrpSp->FileObject, IrpSp->Parameters.SetSecurity.SecurityInformation);
diff --git a/tst/winfsp-tests/memfs.cpp b/tst/winfsp-tests/memfs.cpp
index 7ac683a0..1c185264 100644
--- a/tst/winfsp-tests/memfs.cpp
+++ b/tst/winfsp-tests/memfs.cpp
@@ -598,6 +598,7 @@ static NTSTATUS SetSecurity(FSP_FILE_SYSTEM *FileSystem,
     memcpy(FileSecurity, SecurityDescriptor, FileSecuritySize);
     FspDeleteSecurityDescriptor(NewSecurityDescriptor, (NTSTATUS (*)())FspSetSecurityDescriptor);
 
+    free(FileNode->FileSecurity);
     FileNode->FileSecuritySize = FileSecuritySize;
     FileNode->FileSecurity = FileSecurity;