From dfd2a8fc482ede26e0fa42d22657f4c51555b8fb Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 21 Mar 2018 17:08:54 +0100
Subject: [PATCH] NumericEvaluator: return false for invalid expressions

Clearing bClError flag in NumericEvaluator::parseOk() made the
expression look valid, even if the flag has been set for a previous
token. Now it is cleared before an expression is parsed and verified
after parser finishes.

Fixes: lp:1756995
* https://bugs.launchpad.net/kicad/+bug/1756995
---
 common/libeval/numeric_evaluator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/libeval/numeric_evaluator.cpp b/common/libeval/numeric_evaluator.cpp
index 46884113ce..df988a34ab 100644
--- a/common/libeval/numeric_evaluator.cpp
+++ b/common/libeval/numeric_evaluator.cpp
@@ -121,7 +121,6 @@ NumericEvaluator :: parseError(const char* s)
 void
 NumericEvaluator :: parseOk()
 {
-   bClError = false;
    bClParseFinished = true;
 }
 
@@ -150,6 +149,7 @@ NumericEvaluator :: process(const char* s)
    newString(s);
 
    if (pClParser == nullptr) init();
+   bClError = false;
    bClParseFinished = false;
 
    Token tok;
@@ -320,6 +320,7 @@ NumericEvaluator :: getToken()
          case ')' : retval.token = PARENR; break;
          case '=' : retval.token = ASSIGN; break;
          case ';' : retval.token = SEMCOL; break;
+         default: bClError = true; break;   /* invalid character */
       }
       clToken.pos++;
    }