From 0a087099b6b9f2b0061c6cb343cc69b96f520fc5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Dec 2005 06:06:45 +0000 Subject: [PATCH] fix possible crash if GetVolumeInformation fails: szVolumeNameBuffer would be uninitialized --- .../MemoryCard/MemoryCardDriverThreaded_Windows.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp index 86854b8aad..f6316bbe4b 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp @@ -20,17 +20,19 @@ static bool TestReady( const CString &sDrive, CString &sVolumeLabelOut ) DWORD lpFileSystemFlags; TCHAR szFileSystemNameBuffer[MAX_PATH]; - bool bRet = !!GetVolumeInformation( - sDrive, + if( !GetVolumeInformation( + "j:", szVolumeNameBuffer, sizeof(szVolumeNameBuffer), &dwVolumeSerialNumber, &dwMaximumComponentLength, &lpFileSystemFlags, szFileSystemNameBuffer, - sizeof(szFileSystemNameBuffer) ); + sizeof(szFileSystemNameBuffer)) ) + return false; + sVolumeLabelOut = szVolumeNameBuffer; - return bRet; + return true; } bool MemoryCardDriverThreaded_Windows::TestWrite( UsbStorageDevice* pDevice )