James Hawkins : crypt32: Remove redundant NULL checks before
CryptMemFree ( found by Smatch).
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Oct 6 13:37:10 CDT 2006
Module: wine
Branch: master
Commit: b96ac007645c94c8f44ec8983f53c5b4a247cb43
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96ac007645c94c8f44ec8983f53c5b4a247cb43
Author: James Hawkins <truiken at gmail.com>
Date: Thu Oct 5 19:36:49 2006 -0700
crypt32: Remove redundant NULL checks before CryptMemFree (found by Smatch).
---
dlls/crypt32/protectdata.c | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c
index 75846e7..9cc8584 100644
--- a/dlls/crypt32/protectdata.c
+++ b/dlls/crypt32/protectdata.c
@@ -537,20 +537,13 @@ void free_protect_data(struct protect_da
if (!pInfo) return;
- if (pInfo->info0.pbData)
- CryptMemFree(pInfo->info0.pbData);
- if (pInfo->info1.pbData)
- CryptMemFree(pInfo->info1.pbData);
- if (pInfo->szDataDescr)
- CryptMemFree(pInfo->szDataDescr);
- if (pInfo->data0.pbData)
- CryptMemFree(pInfo->data0.pbData);
- if (pInfo->salt.pbData)
- CryptMemFree(pInfo->salt.pbData);
- if (pInfo->cipher.pbData)
- CryptMemFree(pInfo->cipher.pbData);
- if (pInfo->fingerprint.pbData)
- CryptMemFree(pInfo->fingerprint.pbData);
+ CryptMemFree(pInfo->info0.pbData);
+ CryptMemFree(pInfo->info1.pbData);
+ CryptMemFree(pInfo->szDataDescr);
+ CryptMemFree(pInfo->data0.pbData);
+ CryptMemFree(pInfo->salt.pbData);
+ CryptMemFree(pInfo->cipher.pbData);
+ CryptMemFree(pInfo->fingerprint.pbData);
}
/* copies a string into a data blob */
@@ -768,7 +761,7 @@ BOOL load_encryption_key(HCRYPTPROV hPro
/* clean up */
CryptDestroyHash(hSaltHash);
- if (szUsername) CryptMemFree(szUsername);
+ CryptMemFree(szUsername);
return rc;
}
More information about the wine-cvs
mailing list