diff options
| author | Lorenz Meier <lorenz@px4.io> | 2015-05-13 19:17:15 +0200 |
|---|---|---|
| committer | Lorenz Meier <lorenz@px4.io> | 2015-05-13 19:17:15 +0200 |
| commit | 14b09d6367aa96e63f4a0c8060961dca03b3c05d (patch) | |
| tree | 14482a3ff05e0f074b105d86c1c57894e3a7a29b | |
| parent | 66b87ac7618d2e886b5389e3eef50af182b32f25 (diff) | |
| parent | b4e7b041cac7a937df3ea4e84dc943bff809fb55 (diff) | |
| download | px4-firmware-14b09d6367aa96e63f4a0c8060961dca03b3c05d.tar.gz px4-firmware-14b09d6367aa96e63f4a0c8060961dca03b3c05d.tar.bz2 px4-firmware-14b09d6367aa96e63f4a0c8060961dca03b3c05d.zip | |
Merge pull request #2171 from NaterGator/master
Fix potential null pointer deref in Mavlink dtor if task_main returns error
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 326b0b5ab..a76abc298 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -249,7 +249,9 @@ Mavlink::~Mavlink() } while (_task_running); } - LL_DELETE(_mavlink_instances, this); + if (_mavlink_instances) { + LL_DELETE(_mavlink_instances, this); + } } void |