Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes memory leak in SerialHelper VISA (#366)

Browse Source
This commit is contained in:
Thad House
2016-11-25 15:52:21 -08:00
committed by Peter Johnson
parent d48aac5beb
commit 7d721eb569
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hal/lib/athena/SerialHelper.cpp
View File

@@ -170,7 +170,7 @@ void SerialHelper::QueryHubPaths(int32_t* status) {
if (*status < 0) {
// Handle the bad status elsewhere
// Note let positive statii (warnings) continue
return;
goto done;
}
// Status might be positive, so reset it to 0
*status = 0;
@@ -191,15 +191,15 @@ void SerialHelper::QueryHubPaths(int32_t* status) {
// Open the resource, grab its interface name, and close it.
ViSession vSession;
*status = viOpen(m_resourceHandle, desc, VI_NULL, VI_NULL, &vSession);
if (*status < 0) return;
if (*status < 0) goto done;
*status = 0;
*status = viGetAttribute(vSession, VI_ATTR_INTF_INST_NAME, &osName);
// Ignore an error here, as we want to close the session on an error
// Use a seperate close variable so we can check
ViStatus closeStatus = viClose(vSession);
if (*status < 0) return;
if (closeStatus < 0) return;
if (*status < 0) goto done;
if (closeStatus < 0) goto done;
*status = 0;
// split until (/dev/
@@ -277,6 +277,8 @@ void SerialHelper::QueryHubPaths(int32_t* status) {
CoiteratedSort(m_visaResource);
CoiteratedSort(m_osResource);
done:
viClose(viList);
}
int32_t SerialHelper::GetIndexForPort(HAL_SerialPort port, int32_t* status) {