From 17381b7f37d72179b0ccb13d74d64fcb62387ee8 Mon Sep 17 00:00:00 2001
From: Pawel Dziepak <pdziepak@quarnos.org>
Date: Tue, 29 Oct 2013 18:53:35 +0100
Subject: [PATCH] nfs4: Fix CID 1108338: Fix memory leak

---
 src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp | 10 ++++++----
 src/add-ons/kernel/file_systems/nfs4/NFS4Server.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
index 21411ccfe2..726cbad354 100644
--- a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
@@ -7,9 +7,12 @@
  */
 
 
+#include "NFS4Server.h"
+
+#include <AutoDeleter.h>
+
 #include "FileSystem.h"
 #include "Inode.h"
-#include "NFS4Server.h"
 #include "Request.h"
 #include "WorkQueue.h"
 
@@ -173,12 +176,11 @@ NFS4Server::_GetLeaseTime()
 	result = reply.GetAttr(&values, &count);
 	if (result != B_OK)
 		return result;
+	ArrayDeleter<AttrValue> valuesDeleter(values);
 
 	// FATTR4_LEASE_TIME is mandatory
-	if (count < 1 || values[0].fAttribute != FATTR4_LEASE_TIME) {
-		delete[] values;
+	if (count < 1 || values[0].fAttribute != FATTR4_LEASE_TIME)
 		return B_BAD_VALUE;
-	}
 
 	fLeaseTime = values[0].fData.fValue32;
 
diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h
index c0f2abfcb0..7c2c8a5d52 100644
--- a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h
+++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h
@@ -9,7 +9,7 @@
 #define NFS4SERVER_H
 
 
-#include <lock.h>
+#include <util/AutoLock.h>
 
 #include "ReplyBuilder.h"
 #include "RequestInterpreter.h"