From 409ee1d767583b2b4ab0be9b7e842613b0ad5f31 Mon Sep 17 00:00:00 2001
From: Raphael Assenat <raph@raphnet.net>
Date: Sun, 6 Dec 2015 22:08:08 -0500
Subject: [PATCH] Add argument tests

---
 tool/gcn64.c    |  4 +++-
 tool/gcn64lib.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/tool/gcn64.c b/tool/gcn64.c
index a981f22..330415c 100644
--- a/tool/gcn64.c
+++ b/tool/gcn64.c
@@ -252,7 +252,9 @@ int gcn64_poll_result(gcn64_hdl_t hdl, unsigned char *cmd, int cmd_maxlen)
 		if (copy_len > cmd_maxlen) {
 			copy_len = cmd_maxlen;
 		}
-		memcpy(cmd, buffer+1, copy_len);
+		if (cmd) {
+			memcpy(cmd, buffer+1, copy_len);
+		}
 	}
 
 	return res_len;
diff --git a/tool/gcn64lib.c b/tool/gcn64lib.c
index fa8a496..319c9da 100644
--- a/tool/gcn64lib.c
+++ b/tool/gcn64lib.c
@@ -10,6 +10,10 @@ int gcn64lib_getConfig(gcn64_hdl_t hdl, unsigned char param, unsigned char *rx,
 	unsigned char cmd[2];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = RQ_GCN64_GET_CONFIG_PARAM;
 	cmd[1] = param;
 
@@ -31,6 +35,10 @@ int gcn64lib_setConfig(gcn64_hdl_t hdl, unsigned char param, unsigned char *data
 	unsigned char cmd[2 + len];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = RQ_GCN64_SET_CONFIG_PARAM;
 	cmd[1] = param;
 	memcpy(cmd + 2, data, len);
@@ -47,6 +55,10 @@ int gcn64lib_suspendPolling(gcn64_hdl_t hdl, unsigned char suspend)
 	unsigned char cmd[2];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = RQ_GCN64_SUSPEND_POLLING;
 	cmd[1] = suspend;
 
@@ -62,6 +74,10 @@ int gcn64lib_getVersion(gcn64_hdl_t hdl, char *dst, int dstmax)
 	unsigned char cmd[32];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	if (dstmax <= 0)
 		return -1;
 
@@ -85,6 +101,10 @@ int gcn64lib_getControllerType(gcn64_hdl_t hdl, int chn)
 	unsigned char cmd[32];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = RQ_GCN64_GET_CONTROLLER_TYPE;
 	cmd[1] = chn;
 
@@ -114,6 +134,10 @@ int gcn64lib_getSignature(gcn64_hdl_t hdl, char *dst, int dstmax)
 	unsigned char cmd[40];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	if (dstmax <= 0)
 		return -1;
 
@@ -137,6 +161,10 @@ int gcn64lib_forceVibration(gcn64_hdl_t hdl, unsigned char channel, unsigned cha
 	unsigned char cmd[3];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = RQ_GCN64_SET_VIBRATION;
 	cmd[1] = channel;
 	cmd[2] = vibrate;
@@ -154,6 +182,14 @@ int gcn64lib_rawSiCommand(gcn64_hdl_t hdl, unsigned char channel, unsigned char
 	unsigned char rep[3 + 64];
 	int cmdlen, rx_len, n;
 
+	if (!hdl) {
+		return -1;
+	}
+
+	if (!tx) {
+		return -1;
+	}
+
 	cmd[0] = RQ_GCN64_RAW_SI_COMMAND;
 	cmd[1] = channel;
 	cmd[2] = tx_len;
@@ -165,7 +201,9 @@ int gcn64lib_rawSiCommand(gcn64_hdl_t hdl, unsigned char channel, unsigned char
 		return n;
 
 	rx_len = rep[2];
-	memcpy(rx, rep + 3, rx_len);
+	if (rx) {
+		memcpy(rx, rep + 3, rx_len);
+	}
 
 	return rx_len;
 }
@@ -175,6 +213,10 @@ int gcn64lib_16bit_scan(gcn64_hdl_t hdl, unsigned short min, unsigned short max)
 	int id, n;
 	unsigned char buf[64];
 
+	if (!hdl) {
+		return -1;
+	}
+
 	for (id = min; id<=max; id++) {
 		buf[0] = id >> 8;
 		buf[1] = id & 0xff;
@@ -193,6 +235,10 @@ int gcn64lib_8bit_scan(gcn64_hdl_t hdl, unsigned char min, unsigned char max)
 	int id, n;
 	unsigned char buf[64];
 
+	if (!hdl) {
+		return -1;
+	}
+
 	for (id = min; id<=max; id++) {
 		buf[0] = id;
 		n = gcn64lib_rawSiCommand(hdl, 0, buf, 1, buf, sizeof(buf));
@@ -210,6 +256,10 @@ int gcn64lib_bootloader(gcn64_hdl_t hdl)
 	unsigned char cmd[4];
 	int cmdlen;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = RQ_GCN64_JUMP_TO_BOOTLOADER;
 	cmdlen = 1;
 
@@ -224,6 +274,10 @@ int gcn64lib_n64_expansionWrite(gcn64_hdl_t hdl, unsigned short addr, unsigned c
 	int cmdlen;
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = N64_EXPANSION_WRITE;
 	cmd[1] = addr>>8; // Address high byte
 	cmd[2] = addr&0xff; // Address low byte
@@ -244,6 +298,10 @@ int gcn64lib_n64_expansionRead(gcn64_hdl_t hdl, unsigned short addr, unsigned ch
 	unsigned char cmd[3];
 	int n;
 
+	if (!hdl) {
+		return -1;
+	}
+
 	cmd[0] = N64_EXPANSION_READ;
 	cmd[1] = addr>>8; // Address high byte
 	cmd[2] = addr&0xff; // Address low byte
@@ -254,4 +312,3 @@ int gcn64lib_n64_expansionRead(gcn64_hdl_t hdl, unsigned short addr, unsigned ch
 
 	return n;
 }
-