oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/nfs/Connection: fix memory leak when cancelling Open()

Browse Source 
Close the newly allocated file handle passed to the callback.
This commit is contained in:
Max Kellermann
2014-10-01 22:05:51 +02:00
parent 10cc87e422
commit edd003b62a
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/nfs/Connection.cxx
View File

@@ -94,6 +94,14 @@ NfsConnection::CancellableCallback::Callback(int err, void *data)
cb.OnNfsError(Error(nfs_domain, err,
(const char *)data));
} else {
if (open) {
/* a nfs_open_async() call was cancelled - to
avoid a memory leak, close the newly
allocated file handle immediately */
struct nfsfh *fh = (struct nfsfh *)data;
connection.Close(fh);
}
connection.callbacks.Remove(*this);
}
}
@@ -157,7 +165,7 @@ NfsConnection::Open(const char *path, int flags, NfsCallback &callback,
{
assert(!callbacks.Contains(callback));
auto &c = callbacks.Add(callback, *this);
auto &c = callbacks.Add(callback, *this, true);
if (!c.Open(context, path, flags, error)) {
callbacks.Remove(c);
return false;
@@ -172,7 +180,7 @@ NfsConnection::Stat(struct nfsfh *fh, NfsCallback &callback, Error &error)
{
assert(!callbacks.Contains(callback));
auto &c = callbacks.Add(callback, *this);
auto &c = callbacks.Add(callback, *this, false);
if (!c.Stat(context, fh, error)) {
callbacks.Remove(c);
return false;
@@ -188,7 +196,7 @@ NfsConnection::Read(struct nfsfh *fh, uint64_t offset, size_t size,
{
assert(!callbacks.Contains(callback));
auto &c = callbacks.Add(callback, *this);
auto &c = callbacks.Add(callback, *this, false);
if (!c.Read(context, fh, offset, size, error)) {
callbacks.Remove(c);
return false;