Merge pull request #6846: FileStore: potential memory leak if getattr…

…s fails. Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Feb 8, 2016 · dc2ae8f · dc2ae8f
2 parents 7d5d2a0 + 5d1e6ae
commit dc2ae8f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
@@ -3922,6 +3922,7 @@ int FileStore::_fgetattrs(int fd, map<string,bufferptr>& aset)
     dout(10) << " -ERANGE, got " << len << dendl;
     if (len < 0) {
       assert(!m_filestore_fail_eio || len != -EIO);
+      delete[] names2;
       return len;
     }
     name = names2;
@@ -3940,8 +3941,10 @@ int FileStore::_fgetattrs(int fd, map<string,bufferptr>& aset)
       if (*name) {
         dout(20) << "fgetattrs " << fd << " getting '" << name << "'" << dendl;
         int r = _fgetattr(fd, attrname, aset[name]);
-        if (r < 0)
+        if (r < 0) {
+	  delete[] names2;
 	  return r;
+        }
       }
     }
     name += strlen(name) + 1;