analog.c: Return SR_ERR_ARG upon invalid arguments.

[libsigrok.git] / src / analog.c

diff --git a/src/analog.c b/src/analog.c
index dd23d4b48cf5f5f53fe95575159c871c6c34b3a9..e6efce2eb58e5132826487dd1002740f144d4da2 100644 (file)
--- a/src/analog.c
+++ b/src/analog.c
@@ -117,7 +117,7 @@ static struct unit_mq_string mq_strings[] = {
        ALL_ZERO
 };
 
-SR_PRIV int sr_analog_init(struct sr_datafeed_analog2 *analog,
+SR_PRIV int sr_analog_init(struct sr_datafeed_analog *analog,
                struct sr_analog_encoding *encoding,
                struct sr_analog_meaning *meaning,
                struct sr_analog_spec *spec,
@@ -151,14 +151,18 @@ SR_PRIV int sr_analog_init(struct sr_datafeed_analog2 *analog,
        return SR_OK;
 }
 
-SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
+SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog,
                float *outbuf)
 {
        float offset;
-       unsigned int b, i;
+       unsigned int b, i, count;
        gboolean bigendian;
-       unsigned int count = (analog->num_samples
-                       * g_slist_length(analog->meaning->channels));
+
+       if (!analog || !(analog->data) || !(analog->meaning)
+                       || !(analog->encoding) || !outbuf)
+               return SR_ERR_ARG;
+
+       count = analog->num_samples * g_slist_length(analog->meaning->channels);
 
 #ifdef WORDS_BIGENDIAN
        bigendian = TRUE;
@@ -214,9 +218,12 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
  *
  * @since 0.4.0
  */
-SR_API int sr_analog_float_to_string(float value, int digits, char **result)
+SR_API int sr_analog_float_to_string(float value, unsigned int digits, char **result)
 {
-       int cnt, i;
+       unsigned int cnt, i;
+
+       if (!result)
+               return SR_ERR_ARG;
 
        /* This produces at least one too many digits */
        *result = g_strdup_printf("%.*f", digits, value);
@@ -245,11 +252,16 @@ SR_API int sr_analog_float_to_string(float value, int digits, char **result)
  *
  * @since 0.4.0
  */
-SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog2 *analog,
+SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog *analog,
                char **result)
 {
        int i;
-       GString *buf = g_string_new(NULL);
+       GString *buf;
+
+       if (!analog || !(analog->meaning) || !result)
+               return SR_ERR_ARG;
+
+       buf = g_string_new(NULL);
 
        for (i = 0; unit_strings[i].value; i++) {
                if (analog->meaning->unit == unit_strings[i].value) {
@@ -277,6 +289,9 @@ SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog2 *analog,
  */
 SR_API void sr_rational_set(struct sr_rational *r, int64_t p, uint64_t q)
 {
+       if (!r)
+               return;
+
        r->p = p;
        r->q = q;
 }