From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 27 Oct 2014 17:08:13 +0000 (+0100)
Subject: libradosstriper/striping.cc: fix strdup memory leaks
X-Git-Tag: v0.88~22^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c92d47e5c22f2333e0543fedca141b2b606024b0;p=ceph.git

libradosstriper/striping.cc: fix strdup memory leaks

Fix memory leak caused by using std::string to hold result
of strdup call returned from getObjName().

Fix for Coverity issues:

CID 1221525 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Failing to save or free storage allocated by
 this->getObjName(soid, 0UL) leaks it.

CID 1221526 (1-3 of 3): Resource leak (RESOURCE_LEAK)
 leaked_storage: Failing to save or free storage allocated by
 this->getObjName(soid, *) leaks it.

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

diff --git a/src/test/libradosstriper/striping.cc b/src/test/libradosstriper/striping.cc
index d70e28969c7c4..9b26329c6fccf 100644
--- a/src/test/libradosstriper/striping.cc
+++ b/src/test/libradosstriper/striping.cc
@@ -1,3 +1,5 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// vim: ts=8 sw=2 smarttab
 #include "include/rados/librados.h"
 #include "include/rados/librados.hpp"
 #include "include/radosstriper/libradosstriper.h"
@@ -36,7 +38,7 @@ protected:
   {
     // checking first object's rados xattrs
     bufferlist xattrbl;
-    std::string firstOid = getObjName(soid, 0);
+    char* firstOid = getObjName(soid, 0);
     ASSERT_LT(0, ioctx.getxattr(firstOid, "striper.layout.stripe_unit", xattrbl));
     std::string s_xattr(xattrbl.c_str(), xattrbl.length()); // adds 0 byte at the end
     uint64_t stripe_unit = strtoll(s_xattr.c_str(), NULL, 10);
@@ -83,7 +85,7 @@ protected:
       }
       bufferlist stripe_data;
       // check object content
-      std::string oid = getObjName(soid, object_nb);
+      char* oid = getObjName(soid, object_nb);
       int rc = ioctx.read(oid, stripe_data, len, start);
       if (actual_size_if_sparse < size and
           (actual_size_if_sparse+stripe_unit-1)/stripe_unit <= stripe_nb) {
@@ -100,6 +102,7 @@ protected:
         original_data.substr_of(bl, stripe_nb*stripe_unit, len);
         ASSERT_EQ(0, memcmp(original_data.c_str(), stripe_data.c_str(), len));
       }
+      free(oid);
     }
     // checking rados object sizes; we go object by object
     uint64_t nb_full_object_sets = nb_stripes_in_object / stripe_per_objectset;
@@ -109,7 +112,7 @@ protected:
     for (uint64_t object_nb = 0; object_nb < nb_objects; object_nb++) {
       uint64_t rados_size;
       time_t mtime;
-      std::string oid = getObjName(soid, object_nb);
+      char* oid = getObjName(soid, object_nb);
       uint64_t nb_full_object_set = object_nb / stripe_count;
       uint64_t object_index_in_set = object_nb % stripe_count;
       uint64_t object_start_stripe = nb_full_object_set * stripe_per_objectset + object_index_in_set;
@@ -133,12 +136,15 @@ protected:
         }
         ASSERT_EQ(len, rados_size);
       }
+      free(oid);
     }
     // check we do not have an extra object behind
     uint64_t rados_size;
     time_t mtime;
-    std::string oid = getObjName(soid, nb_objects);
+    char* oid = getObjName(soid, nb_objects);
     ASSERT_EQ(-ENOENT, ioctx.stat(oid, &rados_size, &mtime));
+    free(oid);
+    free(firstOid);
   }
 };