gnuplot output: More error checks.

[libsigrok.git] / output / output_binary.c

diff --git a/output/output_binary.c b/output/output_binary.c
index 2e6603d583c398da62580aa7dd4181038f3ae108..f542958554c50aa7bdaaf7fe5b26153c95d2f93e 100644 (file)
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -24,8 +24,7 @@
 #include <sigrok.h>
 #include "config.h"
 
-
-static int data(struct output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        char *outbuf;
@@ -33,21 +32,38 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
        /* Prevent compiler warnings. */
        o = o;
 
-       if (!(outbuf = calloc(1, length_in)))
-               return SIGROK_ERR_MALLOC;
+       if (!data_in) {
+               g_warning("binary output: %s: data_in was NULL", __func__);
+               return SR_ERR;
+       }
+
+       if (!length_out) {
+               g_warning("binary output: %s: length_out was NULL", __func__);
+               return SR_ERR;
+       }
+
+       if (length_in == 0) {
+               g_warning("binary output: %s: length_in was 0", __func__);
+               return SR_ERR;
+       }
+
+       if (!(outbuf = calloc(1, length_in))) {
+               g_warning("binary output: %s: outbuf calloc failed", __func__);
+               return SR_ERR_MALLOC;
+       }
 
        memcpy(outbuf, data_in, length_in);
        *data_out = outbuf;
        *length_out = length_in;
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-struct output_format output_binary = {
-       "binary",
-       "Raw binary",
-       DF_LOGIC,
-       NULL,
-       data,
-       NULL,
+struct sr_output_format output_binary = {
+       .id = "binary",
+       .description = "Raw binary",
+       .df_type = SR_DF_LOGIC,
+       .init = NULL,
+       .data = data,
+       .event = NULL,
 };