Merge pull request #49 from Toilal/access-denied-file-handle

Fix unstable WRITE when first write fails to open file
winnfsd · Aug 30, 2017 · 26223f9 · 26223f9
2 parents faeee60 + 5fd18b5
commit 26223f9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/NFS3Prog.cpp b/src/NFS3Prog.cpp
@@ -731,16 +731,22 @@ nfsstat3 CNFS3Prog::ProcedureWRITE(void)
 
     file_wcc.before.attributes_follow = GetFileAttributesForNFS(path, &file_wcc.before.attributes);
 
-    if (stat == NFS3_OK) {       
+    if (stat == NFS3_OK) {
 
         if (stable == UNSTABLE) {
             nfs_fh3 handle;
             GetFileHandle(path, &handle);
             int handleId = *(unsigned int *)handle.contents;
+
             if (unstableStorageFile.count(handleId) == 0){
-                unstableStorageFile.insert(std::make_pair(handleId, _fsopen(path, "r+b", _SH_DENYWR)));
+                pFile = _fsopen(path, "r+b", _SH_DENYWR);
+                if (pFile != NULL) {
+                    unstableStorageFile.insert(std::make_pair(handleId, pFile));
+                }
+            } else {
+                pFile = unstableStorageFile[handleId];
             }
-            pFile = unstableStorageFile[handleId];
+
             if (pFile != NULL) {
                 _fseeki64(pFile, offset, SEEK_SET);
                 count = fwrite(data.contents, sizeof(char), data.length, pFile);