hal/*/modules/acq/*_exp.c: fix missing channel number check

This is a trivial bug, in which we weren't checking for the validity of the requested channel number.

hal//modules/acq/_exp.c: fix missing channel number check
This is a trivial bug, in which we weren't checking for the validity of the requested channel number.
b6b5a445 · Lucas Russo · 34e7f573 · b6b5a445
Commit b6b5a445 authored Feb 20, 2015 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

sm_io_acq_exp.c hal/sm_io/modules/acq/sm_io_acq_exp.c +9 -1

No files found.
--- a/hal/sm_io/modules/acq/sm_io_acq_exp.c
+++ b/hal/sm_io/modules/acq/sm_io_acq_exp.c
@@ -193,7 +193,15 @@ static int _acq_get_data_block (void *owner, void *args, void *ret)
    uint32_t chan = *(uint32_t *) EXP_MSG_ZMQ_FIRST_ARG(args);
    uint32_t block_n = *(uint32_t *) EXP_MSG_ZMQ_NEXT_ARG(args);
    DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:acq] get_data_block: "
-            "chan = %u, block_n = %u\n",chan, block_n);
+            "chan = %u, block_n = %u\n", chan, block_n);
+
+    /* channel required is out of the limit */
+    if (chan > SMIO_ACQ_NUM_CHANNELS-1) {
+        DBE_DEBUG (DBG_SM_IO | DBG_LVL_WARN, "[sm_io:acq] data_acquire: "
+                "Channel required is out of the maximum limit\n");
+
+        return -ACQ_NUM_CHAN_OOR;
+    }

    /* Channel features */
    DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:acq] get_data_block: "