Skip to content

W
wine-cw
Commit 01bb8131 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Fixed some duplicate CRYPT_Free calls (spotted by Michael Jung).

parent d9cbfe1d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlls/advapi32/crypt.c
View file @ 01bb8131
...@@ -298,6 +298,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, ...@@ -298,6 +298,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
} }
if (RegOpenKeyA(HKEY_LOCAL_MACHINE, keyname, &key)) { if (RegOpenKeyA(HKEY_LOCAL_MACHINE, keyname, &key)) {
FIXME("Did not find registry entry of crypto provider for %s.\n", debugstr_a(keyname)); FIXME("Did not find registry entry of crypto provider for %s.\n", debugstr_a(keyname));
CRYPT_Free(keyname);
RegCloseKey(key); RegCloseKey(key);
SetLastError(NTE_PROV_TYPE_NOT_DEF); SetLastError(NTE_PROV_TYPE_NOT_DEF);
goto error; goto error;
...@@ -337,8 +338,9 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, ...@@ -337,8 +338,9 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
} }
keyname = CRYPT_GetProvKeyName(provname); keyname = CRYPT_GetProvKeyName(provname);
if (RegOpenKeyA(HKEY_LOCAL_MACHINE, keyname, &key)) goto error; r = RegOpenKeyA(HKEY_LOCAL_MACHINE, keyname, &key);
CRYPT_Free(keyname); CRYPT_Free(keyname);
if (r) goto error;
len = sizeof(DWORD); len = sizeof(DWORD);
r = RegQueryValueExA(key, "Type", NULL, NULL, (BYTE*)&type, &len); r = RegQueryValueExA(key, "Type", NULL, NULL, (BYTE*)&type, &len);
if (r != ERROR_SUCCESS || type != dwProvType) if (r != ERROR_SUCCESS || type != dwProvType)
...@@ -473,7 +475,6 @@ error: ...@@ -473,7 +475,6 @@ error:
CRYPT_Free(provname); CRYPT_Free(provname);
CRYPT_Free(temp); CRYPT_Free(temp);
CRYPT_Free(imagepath); CRYPT_Free(imagepath);
CRYPT_Free(keyname);
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment