mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-31 06:48:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[misc] display image and disk size in the log

Browse source 
* Also fix 2 Coverity warnings
* Also remove unneeded LFs in drive.c
This commit is contained in:
Pete Batard 2017-09-08 15:38:30 +01:00
parent 4a213c3ba0
commit c22b378f9a
5 changed files with 70 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pki.c
View file

@ -157,12 +157,12 @@ char* GetSignatureName(const char* path)
hm = GetModuleHandle(NULL);
if (hm == NULL) {
uprintf("PKI: Could not get current executable handle: %s", WinPKIErrorString());
return NULL;
goto out;
}
dwSize = GetModuleFileNameW(hm, szFileName, MAX_PATH);
if ((dwSize == 0) || ((dwSize == MAX_PATH) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER))) {
uprintf("PKI: Could not get module filename: %s", WinPKIErrorString());
return NULL;
goto out;
}
mpath = wchar_to_utf8(szFileName);
} else {
@ -308,10 +308,14 @@ static uint64_t GetNestedRFC3161TimeStamp(PCMSG_SIGNER_INFO pSignerInfo)
// Loop through unauthenticated attributes for szOID_NESTED_SIGNATURE OID
for (n = 0; ; n++) {
if (pNestedSignature != NULL)
if (pNestedSignature != NULL) {
LocalFree(pNestedSignature);
if (hMsg != NULL)
pNestedSignature = NULL;
}
if (hMsg != NULL) {
CryptMsgClose(hMsg);
hMsg = NULL;
}
safe_free(pNestedSignerInfo);
if (n >= pSignerInfo->UnauthAttrs.cAttr)
break;