Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Address NULL access (windows.plugin) #21112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stelfrag merged 2 commits into from
Oct 8, 2025
Merged

Address NULL access (windows.plugin) #21112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b1eff7
address_null: Change NULL to valid address trying to avoid reported i…
thiagoftsm Oct 7, 2025
2dc9eaf
Merge branch 'master' into address_null
thiagoftsm Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/collectors/windows.plugin/perflib-storage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,26 +175,27 @@ static STRING *getFileSystemType(struct logical_disk *d, const char *diskName)
return NULL;

char fileSystemNameBuffer[128] = {0}; // Buffer for file system name
char pathBuffer[256] = {0}; // Path buffer to accommodate different formats
char pathBuffer[260] = {0}; // Path buffer to accommodate different formats
char volumeName[260] = {0};
DWORD serialNumber = 0;
DWORD maxComponentLength = 0;
DWORD fileSystemFlags = 0;
BOOL success;

// Check if the input is likely a drive letter (e.g., "C:")
if (isalpha((uint8_t)diskName[0]) && diskName[1] == ':' && diskName[2] == '\0')
snprintf(pathBuffer, sizeof(pathBuffer), "%s\\", diskName); // Format as "C:\"
snprintfz(pathBuffer, sizeof(pathBuffer) - 1, "%s\\", diskName); // Format as "C:\"
else
// Assume it's a Volume GUID path or a device path
snprintf(pathBuffer, sizeof(pathBuffer), "\\\\.\\%s\\", diskName); // Format as "\\.\HarddiskVolume1\"
snprintfz(pathBuffer, sizeof(pathBuffer) - 1, "\\\\.\\%s\\", diskName); // Format as "\\.\HarddiskVolume1\"

d->DriveType = GetDriveTypeA(pathBuffer);

// Attempt to get the volume information
success = GetVolumeInformationA(
pathBuffer, // Path to the disk
NULL, // We don't need the volume name
0, // Size of volume name buffer is 0
volumeName, // Volume name buffer
259, // Size of volume name bufferr
&serialNumber, // Volume serial number
&maxComponentLength, // Maximum component length
&fileSystemFlags, // File system flags
Expand Down Expand Up @@ -246,6 +247,7 @@ static inline void netdata_set_hd_usage(PERF_DATA_BLOCK *pDataBlock,
{
ULARGE_INTEGER totalNumberOfBytes;
ULARGE_INTEGER totalNumberOfFreeBytes;
ULARGE_INTEGER totalAvailableToCaller;

// https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
#define MAX_DRIVE_LENGTH 255
Expand All @@ -256,7 +258,7 @@ static inline void netdata_set_hd_usage(PERF_DATA_BLOCK *pDataBlock,
// https://devblogs.microsoft.com/oldnewthing/20071101-00/?p=24613
// We are using the variable that should not be affected by qyota ()
if ((GetDriveTypeA(path) == DRIVE_UNKNOWN) || !GetDiskFreeSpaceExA(path,
NULL,
&totalAvailableToCaller,
&totalNumberOfBytes,
&totalNumberOfFreeBytes)) {
perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &d->percentDiskFree);
Expand Down
Loading