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

lib/nfs/Connection: fix crash while canceling a failing Open()

Browse Source 
The method NfsConnection::CancellableCallback::Callback() will always
invoke NfsConnection::Close() on the file handle, even if the void
pointer is not a nfsfh.  This can happen if the Open() was not
successful, e.g. when the file does not exist.
This commit is contained in:
Max Kellermann 2014-12-14 15:09:55 +01:00
parent 3c29aa6271
commit 4b8d258cff
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.19.7 (not yet released) ver 0.19.7 (not yet released)
* input
- nfs: fix crash while canceling a failing file open operation
* playlist * playlist
- don't skip non-existent songs in "listplaylist" - don't skip non-existent songs in "listplaylist"
* fix memory allocator bug on Windows * fix memory allocator bug on Windows

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

@ -156,8 +156,10 @@ NfsConnection::CancellableCallback::Callback(int err, void *data)
allocated file handle immediately */ allocated file handle immediately */
assert(close_fh == nullptr); assert(close_fh == nullptr);
if (err >= 0) {
struct nfsfh *fh = (struct nfsfh *)data; struct nfsfh *fh = (struct nfsfh *)data;
connection.Close(fh); connection.Close(fh);
}
} else if (close_fh != nullptr) } else if (close_fh != nullptr)
connection.DeferClose(close_fh); connection.DeferClose(close_fh);