Skip to content

v2.0.11 #56

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
merged 2 commits into from
Aug 9, 2021
Merged

v2.0.11 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b131835
Replace delete[] with delete - see #53
PaulZC Aug 9, 2021
47288e4
v2.0.11
PaulZC Aug 9, 2021
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
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=SparkFun u-blox GNSS Arduino Library
version=2.0.10
version=2.0.11
author=SparkFun Electronics <techsupport@sparkfun.com>
maintainer=SparkFun Electronics <sparkfun.com>
sentence=Library for I2C and Serial Communication with u-blox GNSS modules<br/><br/>
Expand Down
116 changes: 58 additions & 58 deletions src/SparkFun_u-blox_GNSS_Arduino_Library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,83 +70,83 @@ void SFE_UBLOX_GNSS::end(void)
_debugSerial->println(F("end: the file buffer has been deleted. You will need to call setFileBufferSize before .begin to create a new one."));
}
#endif
delete[] ubxFileBuffer;
delete[] ubxFileBuffer; // Created with new[]
ubxFileBuffer = NULL; // Redundant?
fileBufferSize = 0; // Reset file buffer size. User will have to call setFileBufferSize again
fileBufferMaxAvail = 0;
}

if (moduleSWVersion != NULL)
{
delete[] moduleSWVersion;
delete moduleSWVersion; // Created with new moduleSWVersion_t
moduleSWVersion = NULL; // Redundant?
}

if (currentGeofenceParams != NULL)
{
delete[] currentGeofenceParams;
delete currentGeofenceParams; // Created with new geofenceParams_t
currentGeofenceParams = NULL; // Redundant?
}

if (packetUBXNAVTIMELS != NULL)
{
delete[] packetUBXNAVTIMELS;
delete packetUBXNAVTIMELS; // Created with new UBX_NAV_TIMELS_t
packetUBXNAVTIMELS = NULL; // Redundant?
}

if (packetUBXNAVPOSECEF != NULL)
{
if (packetUBXNAVPOSECEF->callbackData != NULL)
{
delete[] packetUBXNAVPOSECEF->callbackData;
delete packetUBXNAVPOSECEF->callbackData; // Created with new UBX_NAV_POSECEF_data_t
}
delete[] packetUBXNAVPOSECEF;
delete packetUBXNAVPOSECEF; // Created with new UBX_NAV_POSECEF_t
packetUBXNAVPOSECEF = NULL; // Redundant?
}

if (packetUBXNAVSTATUS != NULL)
{
if (packetUBXNAVSTATUS->callbackData != NULL)
{
delete[] packetUBXNAVSTATUS->callbackData;
delete packetUBXNAVSTATUS->callbackData;
}
delete[] packetUBXNAVSTATUS;
delete packetUBXNAVSTATUS;
packetUBXNAVSTATUS = NULL; // Redundant?
}

if (packetUBXNAVDOP != NULL)
{
if (packetUBXNAVDOP->callbackData != NULL)
{
delete[] packetUBXNAVDOP->callbackData;
delete packetUBXNAVDOP->callbackData;
}
delete[] packetUBXNAVDOP;
delete packetUBXNAVDOP;
packetUBXNAVDOP = NULL; // Redundant?
}

if (packetUBXNAVATT != NULL)
{
if (packetUBXNAVATT->callbackData != NULL)
{
delete[] packetUBXNAVATT->callbackData;
delete packetUBXNAVATT->callbackData;
}
delete[] packetUBXNAVATT;
delete packetUBXNAVATT;
packetUBXNAVATT = NULL; // Redundant?
}

if (packetUBXNAVPVT != NULL)
{
if (packetUBXNAVPVT->callbackData != NULL)
{
delete[] packetUBXNAVPVT->callbackData;
delete packetUBXNAVPVT->callbackData;
#ifndef SFE_UBLOX_REDUCED_PROG_MEM
if (_printDebug == true)
{
_debugSerial->println(F("end: packetUBXNAVPVT->callbackData has been deleted"));
}
#endif
}
delete[] packetUBXNAVPVT;
delete packetUBXNAVPVT;
packetUBXNAVPVT = NULL; // Redundant?
#ifndef SFE_UBLOX_REDUCED_PROG_MEM
if (_printDebug == true)
Expand All @@ -160,199 +160,199 @@ void SFE_UBLOX_GNSS::end(void)
{
if (packetUBXNAVODO->callbackData != NULL)
{
delete[] packetUBXNAVODO->callbackData;
delete packetUBXNAVODO->callbackData;
}
delete[] packetUBXNAVODO;
delete packetUBXNAVODO;
packetUBXNAVODO = NULL; // Redundant?
}

if (packetUBXNAVVELECEF != NULL)
{
if (packetUBXNAVVELECEF->callbackData != NULL)
{
delete[] packetUBXNAVVELECEF->callbackData;
delete packetUBXNAVVELECEF->callbackData;
}
delete[] packetUBXNAVVELECEF;
delete packetUBXNAVVELECEF;
packetUBXNAVVELECEF = NULL; // Redundant?
}

if (packetUBXNAVVELNED != NULL)
{
if (packetUBXNAVVELNED->callbackData != NULL)
{
delete[] packetUBXNAVVELNED->callbackData;
delete packetUBXNAVVELNED->callbackData;
}
delete[] packetUBXNAVVELNED;
delete packetUBXNAVVELNED;
packetUBXNAVVELNED = NULL; // Redundant?
}

if (packetUBXNAVHPPOSECEF != NULL)
{
if (packetUBXNAVHPPOSECEF->callbackData != NULL)
{
delete[] packetUBXNAVHPPOSECEF->callbackData;
delete packetUBXNAVHPPOSECEF->callbackData;
}
delete[] packetUBXNAVHPPOSECEF;
delete packetUBXNAVHPPOSECEF;
packetUBXNAVHPPOSECEF = NULL; // Redundant?
}

if (packetUBXNAVHPPOSLLH != NULL)
{
if (packetUBXNAVHPPOSLLH->callbackData != NULL)
{
delete[] packetUBXNAVHPPOSLLH->callbackData;
delete packetUBXNAVHPPOSLLH->callbackData;
}
delete[] packetUBXNAVHPPOSLLH;
delete packetUBXNAVHPPOSLLH;
packetUBXNAVHPPOSLLH = NULL; // Redundant?
}

if (packetUBXNAVCLOCK != NULL)
{
if (packetUBXNAVCLOCK->callbackData != NULL)
{
delete[] packetUBXNAVCLOCK->callbackData;
delete packetUBXNAVCLOCK->callbackData;
}
delete[] packetUBXNAVCLOCK;
delete packetUBXNAVCLOCK;
packetUBXNAVCLOCK = NULL; // Redundant?
}

if (packetUBXNAVSVIN != NULL)
{
if (packetUBXNAVSVIN->callbackData != NULL)
{
delete[] packetUBXNAVSVIN->callbackData;
delete packetUBXNAVSVIN->callbackData;
}
delete[] packetUBXNAVSVIN;
delete packetUBXNAVSVIN;
packetUBXNAVSVIN = NULL; // Redundant?
}

if (packetUBXNAVRELPOSNED != NULL)
{
if (packetUBXNAVRELPOSNED->callbackData != NULL)
{
delete[] packetUBXNAVRELPOSNED->callbackData;
delete packetUBXNAVRELPOSNED->callbackData;
}
delete[] packetUBXNAVRELPOSNED;
delete packetUBXNAVRELPOSNED;
packetUBXNAVRELPOSNED = NULL; // Redundant?
}

if (packetUBXRXMSFRBX != NULL)
{
if (packetUBXRXMSFRBX->callbackData != NULL)
{
delete[] packetUBXRXMSFRBX->callbackData;
delete packetUBXRXMSFRBX->callbackData;
}
delete[] packetUBXRXMSFRBX;
delete packetUBXRXMSFRBX;
packetUBXRXMSFRBX = NULL; // Redundant?
}

if (packetUBXRXMRAWX != NULL)
{
if (packetUBXRXMRAWX->callbackData != NULL)
{
delete[] packetUBXRXMRAWX->callbackData;
delete packetUBXRXMRAWX->callbackData;
}
delete[] packetUBXRXMRAWX;
delete packetUBXRXMRAWX;
packetUBXRXMRAWX = NULL; // Redundant?
}

if (packetUBXCFGRATE != NULL)
{
if (packetUBXCFGRATE->callbackData != NULL)
{
delete[] packetUBXCFGRATE->callbackData;
delete packetUBXCFGRATE->callbackData;
}
delete[] packetUBXCFGRATE;
delete packetUBXCFGRATE;
packetUBXCFGRATE = NULL; // Redundant?
}

if (packetUBXTIMTM2 != NULL)
{
if (packetUBXTIMTM2->callbackData != NULL)
{
delete[] packetUBXTIMTM2->callbackData;
delete packetUBXTIMTM2->callbackData;
}
delete[] packetUBXTIMTM2;
delete packetUBXTIMTM2;
packetUBXTIMTM2 = NULL; // Redundant?
}

if (packetUBXESFALG != NULL)
{
if (packetUBXESFALG->callbackData != NULL)
{
delete[] packetUBXESFALG->callbackData;
delete packetUBXESFALG->callbackData;
}
delete[] packetUBXESFALG;
delete packetUBXESFALG;
packetUBXESFALG = NULL; // Redundant?
}

if (packetUBXESFSTATUS != NULL)
{
if (packetUBXESFSTATUS->callbackData != NULL)
{
delete[] packetUBXESFSTATUS->callbackData;
delete packetUBXESFSTATUS->callbackData;
}
delete[] packetUBXESFSTATUS;
delete packetUBXESFSTATUS;
packetUBXESFSTATUS = NULL; // Redundant?
}

if (packetUBXESFINS != NULL)
{
if (packetUBXESFINS->callbackData != NULL)
{
delete[] packetUBXESFINS->callbackData;
delete packetUBXESFINS->callbackData;
}
delete[] packetUBXESFINS;
delete packetUBXESFINS;
packetUBXESFINS = NULL; // Redundant?
}

if (packetUBXESFMEAS != NULL)
{
if (packetUBXESFMEAS->callbackData != NULL)
{
delete[] packetUBXESFMEAS->callbackData;
delete packetUBXESFMEAS->callbackData;
}
delete[] packetUBXESFMEAS;
delete packetUBXESFMEAS;
packetUBXESFMEAS = NULL; // Redundant?
}

if (packetUBXESFRAW != NULL)
{
if (packetUBXESFRAW->callbackData != NULL)
{
delete[] packetUBXESFRAW->callbackData;
delete packetUBXESFRAW->callbackData;
}
delete[] packetUBXESFRAW;
delete packetUBXESFRAW;
packetUBXESFRAW = NULL; // Redundant?
}

if (packetUBXHNRATT != NULL)
{
if (packetUBXHNRATT->callbackData != NULL)
{
delete[] packetUBXHNRATT->callbackData;
delete packetUBXHNRATT->callbackData;
}
delete[] packetUBXHNRATT;
delete packetUBXHNRATT;
packetUBXHNRATT = NULL; // Redundant?
}

if (packetUBXHNRINS != NULL)
{
if (packetUBXHNRINS->callbackData != NULL)
{
delete[] packetUBXHNRINS->callbackData;
delete packetUBXHNRINS->callbackData;
}
delete[] packetUBXHNRINS;
delete packetUBXHNRINS;
packetUBXHNRINS = NULL; // Redundant?
}

if (packetUBXHNRPVT != NULL)
{
if (packetUBXHNRPVT->callbackData != NULL)
{
delete[] packetUBXHNRPVT->callbackData;
delete packetUBXHNRPVT->callbackData;
}
delete[] packetUBXHNRPVT;
delete packetUBXHNRPVT;
packetUBXHNRPVT = NULL; // Redundant?
}

Expand All @@ -365,7 +365,7 @@ void SFE_UBLOX_GNSS::setPacketCfgPayloadSize(size_t payloadSize)
if ((payloadSize == 0) && (payloadCfg != NULL))
{
// Zero payloadSize? Dangerous! But we'll free the memory anyway...
delete[] payloadCfg;
delete[] payloadCfg; // Created with new[]
payloadCfg = NULL; // Redundant?
packetCfg.payload = payloadCfg;
if ((_printDebug == true) || (_printLimitedDebug == true)) // This is important. Print this if doing limited debugging
Expand All @@ -386,7 +386,7 @@ void SFE_UBLOX_GNSS::setPacketCfgPayloadSize(size_t payloadSize)
uint8_t *newPayload = new uint8_t[payloadSize];
for (size_t i = 0; (i < payloadSize) && (i < packetCfgPayloadSize); i++) // Copy as much existing data as we can
newPayload[i] = payloadCfg[i];
delete[] payloadCfg;
delete[] payloadCfg; // Created with new[]
payloadCfg = newPayload;
packetCfg.payload = payloadCfg;
if (payloadCfg == NULL)
Expand Down Expand Up @@ -1260,7 +1260,7 @@ void SFE_UBLOX_GNSS::process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t r
{
_debugSerial->println(F("process: memory is already allocated for payloadAuto! Deleting..."));
}
delete[] payloadAuto;
delete[] payloadAuto; // Created with new[]
payloadAuto = NULL; // Redundant?
packetAuto.payload = payloadAuto;
}
Expand Down Expand Up @@ -1797,7 +1797,7 @@ void SFE_UBLOX_GNSS::processUBX(uint8_t incoming, ubxPacket *incomingUBX, uint8_
// allocated for packetAuto
if (activePacketBuffer == SFE_UBLOX_PACKET_PACKETAUTO)
{
delete[] payloadAuto;
delete[] payloadAuto; // Created with new[]
payloadAuto = NULL; // Redundant?
packetAuto.payload = payloadAuto;
}
Expand Down