target/riscv: Add null pointer check before right shift for bscan tunneling.

Change-Id: I5d4764c777f33d48705b3e5273eb840c13cfbfb7
Signed-off-by: eolson <erin.olson@seagate.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7814
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
Reviewed-by: Jan Matyas <jan.matyas@codasip.com>

diff --git a/src/target/riscv/batch.c b/src/target/riscv/batch.c
index 8ec043efb734fa6800d7176f38c81beb7ea6934f..d39967e4dfe8bc0e3cf4f7873833237b09c2e4f4 100644 (file)
--- a/src/target/riscv/batch.c
+++ b/src/target/riscv/batch.c
@@ -115,8 +115,10 @@ int riscv_batch_run(struct riscv_batch *batch)
 
        if (bscan_tunnel_ir_width != 0) {
                /* need to right-shift "in" by one bit, because of clock skew between BSCAN TAP and DM TAP */
-               for (size_t i = 0; i < batch->used_scans; ++i)
-                       buffer_shr((batch->fields + i)->in_value, DMI_SCAN_BUF_SIZE, 1);
+               for (size_t i = 0; i < batch->used_scans; ++i) {
+                       if ((batch->fields + i)->in_value)
+                               buffer_shr((batch->fields + i)->in_value, DMI_SCAN_BUF_SIZE, 1);
+               }
        }
 
        for (size_t i = 0; i < batch->used_scans; ++i)