Windows: Ensure pResultCB exists before Authentication

[openafs.git] / src / WINNT / afsrdr / user / RDRInit.cpp

diff --git a/src/WINNT/afsrdr/user/RDRInit.cpp b/src/WINNT/afsrdr/user/RDRInit.cpp
index ad68376..05f8bac 100644 (file)
--- a/src/WINNT/afsrdr/user/RDRInit.cpp
+++ b/src/WINNT/afsrdr/user/RDRInit.cpp
@@ -1322,14 +1322,10 @@ RDR_ProcessRequest( AFSCommRequest *RequestBuffer)
             break;
     }
 
-    if (userp) {
-        pResultCB->Authenticated = cm_HaveToken( userp,
-                                                 RequestBuffer->FileId.Cell);
-    }
-
     if( BooleanFlagOn( RequestBuffer->RequestFlags, AFS_REQUEST_FLAG_SYNCHRONOUS))
     {
-       if (pResultCB == NULL) {
+
+        if (pResultCB == NULL) {
            // We failed probably due to a memory allocation error
             // unless the unsupported flag was set.
            pResultCB = &stResultCB;
@@ -1340,6 +1336,11 @@ RDR_ProcessRequest( AFSCommRequest *RequestBuffer)
                 pResultCB->ResultStatus = STATUS_NO_MEMORY;
        }
 
+        if (userp) {
+            pResultCB->Authenticated = cm_HaveToken( userp,
+                                                     RequestBuffer->FileId.Cell);
+        }
+
         //
         // This is how the filter associates the response information passed in the IOCtl below to the
         // original call. This request index is setup by the filter and should not be modified, otherwise the