From 77c30bdfba9b962a157e4b683895b7c7da613c30 Mon Sep 17 00:00:00 2001
From: Justin Maggard <jmaggard@netgear.com>
Date: Fri, 1 Feb 2013 20:26:52 +0000
Subject: [PATCH] * Check for NULL pointers before reading them.

---
 tivo_beacon.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tivo_beacon.c b/tivo_beacon.c
index 5aa04e5..daa89f0 100644
--- a/tivo_beacon.c
+++ b/tivo_beacon.c
@@ -173,23 +173,23 @@ sendBeaconMessage(int fd, struct sockaddr_in * client, int len, int broadcast)
  * Returns true if this was a broadcast beacon msg
  */
 int
-rcvBeaconMessage(char * beacon)
+rcvBeaconMessage(char *beacon)
 {
-	char * tivoConnect = NULL;
-	char * method = NULL;
-	char * identity = NULL;
-	char * machine = NULL;
-	char * platform = NULL;
-	char * services = NULL;
-	char * cp;
-	char * scp;
-	char * tokptr;
+	char *tivoConnect = NULL;
+	char *method = NULL;
+	char *identity = NULL;
+	char *machine = NULL;
+	char *platform = NULL;
+	char *services = NULL;
+	char *cp;
+	char *scp;
+	char *tokptr;
 
 	cp = strtok_r(beacon, "=\r\n", &tokptr);
 	while( cp != NULL )
 	{
 		scp = cp;
-		cp = strtok_r( NULL, "=\r\n", &tokptr );
+		cp = strtok_r(NULL, "=\r\n", &tokptr);
 		if( strcasecmp(scp, "tivoconnect") == 0 )
 			tivoConnect = cp;
 		else if( strcasecmp(scp, "method") == 0 )
@@ -205,12 +205,12 @@ rcvBeaconMessage(char * beacon)
 		cp = strtok_r(NULL, "=\r\n", &tokptr);
 	}
 
-	if( tivoConnect == NULL )
+	if( !tivoConnect || !platform || !method )
 		return 0;
 
 #ifdef DEBUG
-	static struct aBeacon* topBeacon = NULL;
-	struct aBeacon * b;
+	static struct aBeacon *topBeacon = NULL;
+	struct aBeacon *b;
 	time_t current;
 	int len;
 	char buf[32];