From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 13 May 2013 11:59:59 +0000 (+0200)
Subject: tools/ceph.cc: close file descriptor in error case
X-Git-Tag: v0.63~29^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=043ea2ce9bbde0acb3d6dc3e51cafafba0220875;p=ceph.git

tools/ceph.cc: close file descriptor in error case

CID 717121 (#1 of 1): Resource leak (RESOURCE_LEAK)
  leaked_handle: Handle variable "fd" going out of scope leaks the handle.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index c28c1b200b3e..2859c86b1dee 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -194,6 +194,7 @@ static int get_indata(const char *in_file, bufferlist &indata)
     int err = errno;
     derr << "error getting size of in_file '" << in_file << "': "
 	 << cpp_strerror(err) << dendl;
+    TEMP_FAILURE_RETRY(::close(fd));
     return 1;
   }