From eaa453335563d670d856da44bf4ea1f332c618a7 Mon Sep 17 00:00:00 2001
From: rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544>
Date: Wed, 30 May 2012 13:26:32 +0000
Subject: Ensure check for NULL pointer occurs prior to use, not after

---
 Stars45/RadioTraffic.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'Stars45/RadioTraffic.cpp')

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;
+        }
+    }
 }
 
 // +----------------------------------------------------------------------+
-- 
cgit v1.1