From 8e79c58572bac72489bde00c15d092bce02e850a Mon Sep 17 00:00:00 2001
From: rafael-g <rafael@sizeofvoid.org>
Date: Sun, 5 Jun 2016 08:43:06 +0200
Subject: [Bug #1587311] Entering + into stroke width dialog crashes Inkscape.

Fixed bugs:
  - https://launchpad.net/bugs/1587311

(bzr r14952)
---
 src/util/expression-evaluator.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/util/expression-evaluator.cpp')

diff --git a/src/util/expression-evaluator.cpp b/src/util/expression-evaluator.cpp
index b0b8e6036..dd7ce97f7 100644
--- a/src/util/expression-evaluator.cpp
+++ b/src/util/expression-evaluator.cpp
@@ -208,8 +208,11 @@ EvaluatorQuantity ExpressionEvaluator::evaluateFactor()
 {
     EvaluatorQuantity evaluated_factor = EvaluatorQuantity();
     EvaluatorToken consumed_token = EvaluatorToken();
-    
-    if (acceptToken(TOKEN_NUM, &consumed_token)) {
+
+    if (acceptToken(TOKEN_END, &consumed_token)) {
+        return evaluated_factor;
+    }
+    else if (acceptToken(TOKEN_NUM, &consumed_token)) {
         evaluated_factor.value = consumed_token.value.fl;
     } else if (acceptToken('(', NULL)) {
         evaluated_factor = evaluateExpression();
-- 
cgit v1.2.3