Ken Thomases : secur32: Eliminate broken clean-up "cheat".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d977044e7680362d89de101fc866b12cda40577c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d977044e7680362d89de101fc8...

Author: Ken Thomases 
Date:   Tue Nov 29 19:16:32 2011 -0600

secur32: Eliminate broken clean-up "cheat".

---

dlls/secur32/ntlm.c |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c
index c1e4466..d002b37 100644
--- a/dlls/secur32/ntlm.c
+++ b/dlls/secur32/ntlm.c
@@ -2030,21 +2030,17 @@ void SECUR32_initNTLMSP(void)
         NULL };

if(fork_helper(&helper, ntlm_auth, args) != SEC_E_OK)
-    {
-        /* Cheat and allocate a helper anyway, so cleanup later will work. */
-        helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper));
-        helper->major = helper->minor = helper->micro = -1;
-        helper->pipe_in = helper->pipe_out = -1;
-    }
+        helper = NULL;
     else
         check_version(helper);

-    if( (helper->major >  MIN_NTLM_AUTH_MAJOR_VERSION) ||
-        (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION  &&
-         helper->minor >  MIN_NTLM_AUTH_MINOR_VERSION) ||
-        (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION  &&
-         helper->minor == MIN_NTLM_AUTH_MINOR_VERSION  &&
-         helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION) )
+    if( helper &&
+        ((helper->major >  MIN_NTLM_AUTH_MAJOR_VERSION) ||
+         (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION  &&
+          helper->minor >  MIN_NTLM_AUTH_MINOR_VERSION) ||
+         (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION  &&
+          helper->minor == MIN_NTLM_AUTH_MINOR_VERSION  &&
+          helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION)) )
     {
         SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL);
         SecureProvider *nego_provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL);