Prevent some SEGVs on ill-formed comands.

1 files changed, 2 insertions, 2 deletions

diff --git a/gpsd.c b/gpsd.c
index 13ee8e2a..1d5219c5 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1645,7 +1645,7 @@ static void handle_newstyle_request(struct subscriber_t *sub,
 	    int status;
 	    status = json_watch_read(buf+1, &sub->policy, &end);
 	    if (status == 0) {
-		if (*end == ';')
+		if (*end != NULL && *end == ';')
 		    ++end;
 		if (sub->policy.watcher)
 		    for(devp = devices; devp < devices + MAXDEVICES; devp++)
@@ -1683,7 +1683,7 @@ static void handle_newstyle_request(struct subscriber_t *sub,
 	    if (*buf == '=') {
 		int status;
 		status = json_device_read(buf+1, &devconf, &end);
-		if (*end == ';')
+		if (end != NULL && *end == ';')
 		    ++end;
 		if (status != 0)
 		    (void)snprintf(reply, replylen,