fix possible crash if GetVolumeInformation fails: szVolumeNameBuffer would

be uninitialized
This commit is contained in:
Glenn Maynard
2005-12-24 06:06:45 +00:00
parent 635434ea17
commit 0a087099b6
@@ -20,17 +20,19 @@ static bool TestReady( const CString &sDrive, CString &sVolumeLabelOut )
DWORD lpFileSystemFlags; DWORD lpFileSystemFlags;
TCHAR szFileSystemNameBuffer[MAX_PATH]; TCHAR szFileSystemNameBuffer[MAX_PATH];
bool bRet = !!GetVolumeInformation( if( !GetVolumeInformation(
sDrive, "j:",
szVolumeNameBuffer, szVolumeNameBuffer,
sizeof(szVolumeNameBuffer), sizeof(szVolumeNameBuffer),
&dwVolumeSerialNumber, &dwVolumeSerialNumber,
&dwMaximumComponentLength, &dwMaximumComponentLength,
&lpFileSystemFlags, &lpFileSystemFlags,
szFileSystemNameBuffer, szFileSystemNameBuffer,
sizeof(szFileSystemNameBuffer) ); sizeof(szFileSystemNameBuffer)) )
return false;
sVolumeLabelOut = szVolumeNameBuffer; sVolumeLabelOut = szVolumeNameBuffer;
return bRet; return true;
} }
bool MemoryCardDriverThreaded_Windows::TestWrite( UsbStorageDevice* pDevice ) bool MemoryCardDriverThreaded_Windows::TestWrite( UsbStorageDevice* pDevice )