From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Wed, 24 Aug 2011 21:52:47 +0000 (-0700)
Subject: test/confutils.cc: fix resource leak
X-Git-Tag: v0.35~230
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94af6a4c876aa1ab3a69599b898c3824f31a9317;p=ceph.git

test/confutils.cc: fix resource leak

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/src/test/confutils.cc b/src/test/confutils.cc
index b67aadff7ae1..e024da3b4b9e 100644
--- a/src/test/confutils.cc
+++ b/src/test/confutils.cc
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <tr1/memory>
 
 using ceph::bufferlist;
 using std::cerr;
@@ -77,6 +78,7 @@ static int create_tempfile(const std::string &fname, const char *text)
 	 << get_temp_dir() << "'. " << cpp_strerror(err) << std::endl;
     return err;
   }
+  std::tr1::shared_ptr<FILE> fpp(fp, fclose);
   if (unlink_idx >= MAX_FILES_TO_DELETE)
     return -ENOBUFS;
   if (unlink_idx == 0) {
@@ -90,10 +92,8 @@ static int create_tempfile(const std::string &fname, const char *text)
     int err = errno;
     cerr << "fwrite error while writing to " << fname 
 	 << ": " << cpp_strerror(err) << std::endl;
-    fclose(fp);
     return err;
   }
-  fclose(fp);
   return 0;
 }