From: Uwe Hermann <redacted>
Date: Thu, 10 Sep 2015 16:19:47 +0000 (+0200)
Subject: instance.c: Don't use 'di' before NULL-checking it.
X-Git-Tag: libsigrokdecode-0.4.0~69
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=2730fe2397101f2c0a66abd3a7fd5fa531d3c710;p=libsigrokdecode.git

instance.c: Don't use 'di' before NULL-checking it.
---

diff --git a/instance.c b/instance.c
index bfe9142..3fa3e5d 100644
--- a/instance.c
+++ b/instance.c
@@ -546,14 +546,6 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
 	PyObject *py_res;
 	srd_logic *logic;
 
-	((struct srd_decoder_inst *)di)->data_unitsize = unitsize;
-
-	srd_dbg("Calling decode(), start sample %" PRIu64 ", end sample %"
-		PRIu64 " (%" PRIu64 " samples, %" PRIu64 " bytes, unitsize = "
-		"%d), instance %s.", start_samplenum, end_samplenum,
-		end_samplenum - start_samplenum, inbuflen, di->data_unitsize,
-		di->inst_id);
-
 	/* Return an error upon unusable input. */
 	if (!di) {
 		srd_dbg("empty decoder instance");
@@ -568,6 +560,14 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
 		return SRD_ERR_ARG;
 	}
 
+	((struct srd_decoder_inst *)di)->data_unitsize = unitsize;
+
+	srd_dbg("Calling decode(), start sample %" PRIu64 ", end sample %"
+		PRIu64 " (%" PRIu64 " samples, %" PRIu64 " bytes, unitsize = "
+		"%d), instance %s.", start_samplenum, end_samplenum,
+		end_samplenum - start_samplenum, inbuflen, di->data_unitsize,
+		di->inst_id);
+
 	/*
 	 * Create new srd_logic object. Each iteration around the PD's loop
 	 * will fill one sample into this object.