From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Wed, 4 Sep 2013 12:04:41 +0000 (+0800)
Subject: Fix segfault and bounds checking on sensor queries
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=17d812fec1b76fb6042e10067e34eb296bc5280b;p=matches%2FMCTX3420.git

Fix segfault and bounds checking on sensor queries
---

diff --git a/server/sensor.c b/server/sensor.c
index 8115a3b..2e0749e 100644
--- a/server/sensor.c
+++ b/server/sensor.c
@@ -12,7 +12,7 @@
 
 /** Array of sensors, initialised by Sensor_Init **/
 static Sensor g_sensors[NUMSENSORS]; //global to this file
-static const char * g_sensor_names[] = {"analog_test0","analog_test1","digital_test0"};
+static const char * g_sensor_names[] = {"analog_test0","analog_test1","digital_test0","digital_test1"};
 /**
  * Read a data value from a sensor; block until value is read
  * @param sensor_id - The ID of the sensor
@@ -195,7 +195,7 @@ Sensor * Sensor_Identify(const char * id_str)
 		return NULL;
 	}
 	// Bounds check
-	if (id < 0 || id > NUMSENSORS)
+	if (id < 0 || id >= NUMSENSORS)
 		return NULL;