From 49951cd19716ccc9bfc77a7d66153441d4ed8bb4 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Tue, 26 Mar 2024 20:08:08 +0100
Subject: [PATCH] Bug 664: Report an error if token in meas statement is not a
 vector and cannot be evaluated as a number.

---
 src/frontend/com_measure2.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index b36a510ce..1a4be8a97 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -1481,6 +1481,10 @@ measure_parse_when(
                     correct_vec(meas);
             } else {
                 meas->m_val = INPevaluate(&pVar2, &err, 1);
+                if (err) {
+                    snprintf(errBuf, 99, "Cannot evaluate %s \n", pVar2);
+                    return MEASUREMENT_FAILURE;
+                }
             }
         } else {
             if (measure_parse_stdParams(meas, wl, NULL, errBuf) == MEASUREMENT_FAILURE)