pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 09:42:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Remove unnecessary null pointer checks (#6358)

Browse Source 
As reported by @elfring, we had several points in our code where
it was unnecessary to check pointers were non-null before deleting them.

Fixes https://github.com/meshtastic/firmware/issues/6170
This commit is contained in:
Tom Fifield 2025-03-21 21:54:42 +11:00 committed by GitHub
parent 31c0e8fa2c
commit ae27aaaf43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AudioThread.h
View File

@ -41,10 +41,8 @@ class AudioThread : public concurrency::OSThread
delete i2sRtttl; delete i2sRtttl;
i2sRtttl = nullptr; i2sRtttl = nullptr;
} }
if (rtttlFile != nullptr) {
delete rtttlFile; delete rtttlFile;
rtttlFile = nullptr; rtttlFile = nullptr;
}
setCPUFast(false); setCPUFast(false);
} }

2
src/mesh/CryptoEngine.cpp
View File

@ -161,10 +161,8 @@ void CryptoEngine::hash(uint8_t *bytes, size_t numBytes)
void CryptoEngine::aesSetKey(const uint8_t *key_bytes, size_t key_len) void CryptoEngine::aesSetKey(const uint8_t *key_bytes, size_t key_len)
{ {
if (aes) {
delete aes; delete aes;
aes = nullptr; aes = nullptr;
}
if (key_len != 0) { if (key_len != 0) {
aes = new AESSmall256(); aes = new AESSmall256();
aes->setKey(key_bytes, key_len); aes->setKey(key_bytes, key_len);

2
src/motion/AccelerometerThread.h
View File

@ -160,11 +160,9 @@ class AccelerometerThread : public concurrency::OSThread
void clean() void clean()
{ {
isInitialised = false; isInitialised = false;
if (sensor != nullptr) {
delete sensor; delete sensor;
sensor = nullptr; sensor = nullptr;
} }
}
}; };
#endif #endif