Sanity check for too many devices on the command line.

All regression tests pass.

1 files changed, 11 insertions, 1 deletions

diff --git a/gpsd.c b/gpsd.c
index 4ca549d5..53c2a3ba 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -829,8 +829,11 @@ static void handle_control(int sfd, char *buf)
 			"<= control(%d): adding %s\n", sfd, stash);
 	    if (gpsd_add_device(stash, NOWAIT))
 		ignore_return(write(sfd, "OK\n", 3));
-	    else
+	    else {
 		ignore_return(write(sfd, "ERROR\n", 6));
+		gpsd_report(&context.errout, LOG_INF,
+			    "control(%d): adding %s failed, too many devices active\n", sfd, stash);
+	    }
 	}
     } else if (buf[0] == '!') {
 	/* split line after ! into device=string, send string to device */
@@ -1879,6 +1882,13 @@ int main(int argc, char *argv[])
 	}
     }
 
+    /* sanity check */
+    if (argc - optind > MAXDEVICES) {
+	gpsd_report(&context.errout, LOG_ERROR,
+		    "too many devices on command line\n");
+	exit(1);
+    }
+
 #ifdef SYSTEMD_ENABLE
     sd_socket_count = sd_get_socket_count();
     if (sd_socket_count > 0 && control_socket != NULL) {