1 files changed, 6 insertions, 2 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 6c58c1d666..b4a2cf9596 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -1279,9 +1279,9 @@ static int find_conditional_end(struct wps_data *data, int index)
     }
 
     int ret = index;
-    do
+    while (data->tokens[ret].value.i != 0
+           && data->tokens[data->tokens[ret].value.i].type != WPS_TOKEN_CONDITIONAL_END)
         ret = data->tokens[ret].value.i;
-    while (data->tokens[ret].type != WPS_TOKEN_CONDITIONAL_END);
 
     /* ret now is the index to the end token for the conditional. */
     return ret;
@@ -1307,6 +1307,10 @@ static int evaluate_conditional(struct gui_wps *gwps, int cond_index)
            && cond_start < data->num_tokens)
         cond_start++;
 
+    /* if the number of options is 0, the conditional is invalid */
+    if (num_options == 0)
+        return cond_start;
+
     /* treat ?xx<true> constructs as if they had 2 options. */
     if (num_options < 2)
         num_options = 2;