diff options
| author | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
|---|---|---|
| committer | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
| commit | eaa453335563d670d856da44bf4ea1f332c618a7 (patch) | |
| tree | a976bf3e0fc4b690042915745e637eb6b00929e4 /Stars45/RadioTraffic.cpp | |
| parent | 035cfd86e5d221cffb2673e936dcb8703e28ce4b (diff) | |
| download | starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.zip starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.gz starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.bz2 | |
Ensure check for NULL pointer occurs prior to use, not after
Diffstat (limited to 'Stars45/RadioTraffic.cpp')
| -rw-r--r-- | Stars45/RadioTraffic.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Stars45/RadioTraffic.cpp b/Stars45/RadioTraffic.cpp index b5caba0..d87ed2f 100644 --- a/Stars45/RadioTraffic.cpp +++ b/Stars45/RadioTraffic.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: RadioTraffic.cpp
@@ -371,14 +371,16 @@ RadioTraffic::DisplayMessage(RadioMessage* msg) RadioVox* vox = new(__FILE__,__LINE__) RadioVox(vox_channel, path[vox_channel], txt_buf);
- vox->AddPhrase(dst_buf);
- vox->AddPhrase(src_buf);
- vox->AddPhrase(act_buf);
+ if (vox) {
+ vox->AddPhrase(dst_buf);
+ vox->AddPhrase(src_buf);
+ vox->AddPhrase(act_buf);
- if (vox && !vox->Start()) {
- RadioView::Message(txt_buf);
- delete vox;
- }
+ if (!vox->Start()) {
+ RadioView::Message(txt_buf);
+ delete vox;
+ }
+ }
}
// +----------------------------------------------------------------------+
|