Skip to content

Resolve variable length array warnings when compiling with Clang #480

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

Open
ERSUCC wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −5
Open

Resolve variable length array warnings when compiling with Clang #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions RtAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ std::string convertCharPointerToStdString(const wchar_t* text)
return nret;
#else
std::string result;
char dest[MB_CUR_MAX];
char* dest = (char*)malloc(sizeof(char) * MB_CUR_MAX);
// get number of wide characters in text
const size_t length = wcslen(text);
for (size_t i = 0; i < length; i++) {
Expand All @@ -103,6 +103,7 @@ std::string convertCharPointerToStdString(const wchar_t* text)
result += dest[j];
}
}
free(dest);
return result;
#endif
}
Expand Down Expand Up @@ -1140,10 +1141,18 @@ void RtApiCore :: probeDevices( void )
return;
}

AudioDeviceID ids[ nDevices ];
AudioDeviceID* ids = (AudioDeviceID*)malloc(sizeof(AudioDeviceID) * nDevices);

if ( ids == NULL ) {
errorText_ = "RtApiCore::probeDevices: memory error allocating AudioDeviceID list.";
error( RTAUDIO_WARNING );
return;
}

property.mSelector = kAudioHardwarePropertyDevices;
result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, (void *) &ids );
result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, (void *) ids );
if ( result != noErr ) {
free(ids);
errorText_ = "RtApiCore::probeDevices: OS-X system error getting device IDs.";
error( RTAUDIO_SYSTEM_ERROR );
return;
Expand Down Expand Up @@ -1182,6 +1191,8 @@ void RtApiCore :: probeDevices( void )
}
}

free(ids);

// Get default devices and set flags in deviceList_.
AudioDeviceID defaultOutputId, defaultInputId;
dataSize = sizeof( AudioDeviceID );
Expand Down Expand Up @@ -1351,9 +1362,17 @@ bool RtApiCore :: probeDeviceInfo( AudioDeviceID id, RtAudio::DeviceInfo& info )
}

UInt32 nRanges = dataSize / sizeof( AudioValueRange );
AudioValueRange rangeList[ nRanges ];
result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &rangeList );
AudioValueRange* rangeList = (AudioValueRange*)malloc(sizeof(AudioValueRange) * nRanges);

if ( rangeList == NULL ) {
errorText_ = "RtApiCore::probeDeviceInfo: memory error allocating AudioValueRange list.";
error( RTAUDIO_WARNING );
return false;
}

result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, rangeList );
if ( result != kAudioHardwareNoError ) {
free(rangeList);
errorStream_ << "RtApiCore::probeDeviceInfo: system error (" << getErrorCode( result ) << ") getting sample rates.";
errorText_ = errorStream_.str();
error( RTAUDIO_WARNING );
Expand Down Expand Up @@ -1385,6 +1404,8 @@ bool RtApiCore :: probeDeviceInfo( AudioDeviceID id, RtAudio::DeviceInfo& info )
}
}

free(rangeList);

if ( haveValueRange ) {
for ( unsigned int k=0; k<MAX_SAMPLE_RATES; k++ ) {
if ( SAMPLE_RATES[k] >= (unsigned int) minimumRate && SAMPLE_RATES[k] <= (unsigned int) maximumRate ) {
Expand Down
Loading