X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_binary.c;h=98ad3ad93c0aa96205fa47e01135a799bac07c93;hb=9f45fb3aea9aa628ec2323bac8f2c354f5f3983c;hp=076d497ce2b5c9a2f6d04796ebd3fd3a104c0539;hpb=d078d2e5f3842b1915ffa9961654f3aa4ed88e17;p=libsigrok.git

diff --git a/output/output_binary.c b/output/output_binary.c
index 076d497c..98ad3ad9 100644
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "config.h"
 
 static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
@@ -30,10 +31,27 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	/* Prevent compiler warnings. */
-	o = o;
+	(void)o;
 
-	if (!(outbuf = calloc(1, length_in)))
+	if (!data_in) {
+		sr_warn("binary output: %s: data_in was NULL", __func__);
+		return SR_ERR;
+	}
+
+	if (!length_out) {
+		sr_warn("binary output: %s: length_out was NULL", __func__);
+		return SR_ERR;
+	}
+
+	if (length_in == 0) {
+		sr_warn("binary output: %s: length_in was 0", __func__);
+		return SR_ERR;
+	}
+
+	if (!(outbuf = calloc(1, length_in))) {
+		sr_warn("binary output: %s: outbuf calloc failed", __func__);
 		return SR_ERR_MALLOC;
+	}
 
 	memcpy(outbuf, data_in, length_in);
 	*data_out = outbuf;
@@ -43,10 +61,10 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_binary = {
-	"binary",
-	"Raw binary",
-	SR_DF_LOGIC,
-	NULL,
-	data,
-	NULL,
+	.id = "binary",
+	.description = "Raw binary",
+	.df_type = SR_DF_LOGIC,
+	.init = NULL,
+	.data = data,
+	.event = NULL,
 };