fix possible crash if GetVolumeInformation fails: szVolumeNameBuffer would
be uninitialized
This commit is contained in:
@@ -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 )
|
||||||
|
|||||||
Reference in New Issue
Block a user