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

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.

lib/nfs/Connection: fix crash while canceling a failing Open()
4b8d258c · Max Kellermann · 3c29aa62 · 4b8d258c · 4b8d258c
Commit 4b8d258c authored Dec 14, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

NEWS NEWS +2 -0

Connection.cxx src/lib/nfs/Connection.cxx +4 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.19.7 (not yet released)
+* input
+  - nfs: fix crash while canceling a failing file open operation
 * playlist
  - don't skip non-existent songs in "listplaylist"
 * fix memory allocator bug on Windows

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