From: Gerhard Sittig <redacted>
Date: Fri, 9 Feb 2018 18:29:08 +0000 (+0100)
Subject: scpi-pps: silence potential NULL dereference compiler warning
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=08eba2d30167ec3f6ec12ac8c4f5d256f8b20f33;hp=6a821db6f2dc4bef110b0c33f50ff5753f7fdf0f;p=libsigrok.git

scpi-pps: silence potential NULL dereference compiler warning

Check pointers' validity before dereferencing them.

This was reported by clang's scan-build.
---

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 6ffc17d4..9158933d 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -525,10 +525,12 @@ static int config_list(uint32_t key, GVariant **data,
 			return std_opts_config_list(key, data, sdi, cg,
 				ARRAY_AND_SIZE(scanopts),
 				ARRAY_AND_SIZE(drvopts),
-				(devc) ? devc->device->devopts : NULL,
-				(devc) ? devc->device->num_devopts : 0);
+				(devc && devc->device) ? devc->device->devopts : NULL,
+				(devc && devc->device) ? devc->device->num_devopts : 0);
 			break;
 		case SR_CONF_CHANNEL_CONFIG:
+			if (!devc || !devc->device)
+				return SR_ERR_ARG;
 			/* Not used. */
 			i = 0;
 			if (devc->device->features & PPS_INDEPENDENT)
@@ -557,6 +559,8 @@ static int config_list(uint32_t key, GVariant **data,
 		 * specification for use in series or parallel mode.
 		 */
 		ch = cg->channels->data;
+		if (!devc || !devc->device)
+			return SR_ERR_ARG;
 		ch_spec = &(devc->device->channels[ch->index]);
 
 		switch (key) {