Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 07:56:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FRAGINATOR] Fix some uninitialized variables and make it work again (#4497)

Browse source 
Set BitmapSize to zero so DeviceIOControl doesn't fail.

ROSAPPS-332
This commit is contained in:
Marcus Boillat 2022-05-20 13:59:01 +02:00 • committed by GitHub
parent 4f8bbd141e
commit 05183677d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/rosapps/applications/fraginator/DriveVolume.cpp
View file

@ -5,7 +5,7 @@ DriveVolume::DriveVolume ()
{ {
Handle = INVALID_HANDLE_VALUE; Handle = INVALID_HANDLE_VALUE;
BitmapDetail = NULL; BitmapDetail = NULL;
return; ZeroMemory(&Geometry, sizeof(Geometry));
} }
@ -28,7 +28,7 @@ void DriveVolume::Close (void)
if (BitmapDetail != NULL) if (BitmapDetail != NULL)
{ {
free (BitmapDetail); HeapFree(GetProcessHeap(), 0, BitmapDetail);
BitmapDetail = NULL; BitmapDetail = NULL;
} }
@ -185,7 +185,7 @@ bool DriveVolume::GetBitmap (void)
// then correctly allocate based off that // then correctly allocate based off that
// I suppose this won't work if your drive has only 40 clusters on it or so :) // I suppose this won't work if your drive has only 40 clusters on it or so :)
BitmapSize = sizeof (VOLUME_BITMAP_BUFFER) + 4; BitmapSize = sizeof (VOLUME_BITMAP_BUFFER) + 4;
Bitmap = (VOLUME_BITMAP_BUFFER *) malloc (BitmapSize); Bitmap = (VOLUME_BITMAP_BUFFER *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BitmapSize);
Result = DeviceIoControl Result = DeviceIoControl
( (
@ -203,13 +203,24 @@ bool DriveVolume::GetBitmap (void)
if (Result == FALSE && GetLastError() != ERROR_MORE_DATA) if (Result == FALSE && GetLastError() != ERROR_MORE_DATA)
{ {
//wprintf ("\nDeviceIoControl returned false, GetLastError() was not ERROR_MORE_DATA\n"); //wprintf ("\nDeviceIoControl returned false, GetLastError() was not ERROR_MORE_DATA\n");
free (Bitmap); HeapFree(GetProcessHeap(), 0, Bitmap);
return (false); return (false);
} }
// Otherwise, we're good // Otherwise, we're good
BitmapSize = sizeof (VOLUME_BITMAP_BUFFER) + (Bitmap->BitmapSize.QuadPart / 8) + 1; BitmapSize = sizeof (VOLUME_BITMAP_BUFFER) + (Bitmap->BitmapSize.QuadPart / 8) + 1;
Bitmap = (VOLUME_BITMAP_BUFFER *) realloc (Bitmap, BitmapSize);
void *reallBitmap = HeapReAlloc(GetProcessHeap(), 0, Bitmap, BitmapSize);
if (reallBitmap == NULL)
{
// Fail "miserably"
wprintf(L"\nNot enough memory to read volume bitmap\n");
HeapFree(GetProcessHeap(), 0, Bitmap);
return (false);
}
Bitmap = (VOLUME_BITMAP_BUFFER *)reallBitmap;
Result = DeviceIoControl Result = DeviceIoControl
( (
Handle, Handle,
@ -227,7 +238,7 @@ bool DriveVolume::GetBitmap (void)
if (Result == FALSE) if (Result == FALSE)
{ {
wprintf (L"\nCouldn't properly read volume bitmap\n"); wprintf (L"\nCouldn't properly read volume bitmap\n");
free (Bitmap); HeapFree(GetProcessHeap(), 0, Bitmap);
return (false); return (false);
} }
@ -237,9 +248,9 @@ bool DriveVolume::GetBitmap (void)
VolInfo.ClusterCount = Bitmap->BitmapSize.QuadPart; VolInfo.ClusterCount = Bitmap->BitmapSize.QuadPart;
if (BitmapDetail != NULL) if (BitmapDetail != NULL)
free (BitmapDetail); HeapFree(GetProcessHeap(), 0, BitmapDetail);
BitmapDetail = (uint32 *) malloc (sizeof(uint32) * (1 + (VolInfo.ClusterCount / 32))); BitmapDetail = (uint32 *) HeapAlloc(GetProcessHeap(), 0, sizeof(uint32) * (1 + (VolInfo.ClusterCount / 32)));
memcpy (BitmapDetail, Bitmap->Buffer, sizeof(uint32) * (1 + (VolInfo.ClusterCount / 32))); memcpy (BitmapDetail, Bitmap->Buffer, sizeof(uint32) * (1 + (VolInfo.ClusterCount / 32)));
/* /*
@ -253,7 +264,7 @@ bool DriveVolume::GetBitmap (void)
} }
*/ */
free (Bitmap); HeapFree(GetProcessHeap(), 0, Bitmap);
return (true); return (true);
} }