summaryrefslogtreecommitdiffstats
path: root/src/util/expression-evaluator.cpp
diff options
context:
space:
mode:
authorrafael-g <rafael@sizeofvoid.org>2016-06-05 06:32:58 +0000
committerJazzyNico <nicoduf@yahoo.fr>2016-06-05 06:32:58 +0000
commitfb6ee4a8495b064e6a64e1abec212941ce7c96f9 (patch)
tree24e4c97414dc7adf1d1e445021eec56dc6b33222 /src/util/expression-evaluator.cpp
parentFix reading of 'stroke-dasharray' when there is a trailing blank. (diff)
downloadinkscape-fb6ee4a8495b064e6a64e1abec212941ce7c96f9.tar.gz
inkscape-fb6ee4a8495b064e6a64e1abec212941ce7c96f9.zip
[Bug #1550178] Inkscape crashed with segfault in ExpressionEvaluator on OpenBSD.
Fixed bugs: - https://launchpad.net/bugs/1550178 (bzr r14951)
Diffstat (limited to '')
-rw-r--r--src/util/expression-evaluator.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/util/expression-evaluator.cpp b/src/util/expression-evaluator.cpp
index 48064e647..b0b8e6036 100644
--- a/src/util/expression-evaluator.cpp
+++ b/src/util/expression-evaluator.cpp
@@ -28,6 +28,8 @@
#include "util/expression-evaluator.h"
#include "util/units.h"
+#include <glib/gconvert.h>
+
#include <math.h>
#include <string.h>
@@ -49,7 +51,7 @@ EvaluatorToken::EvaluatorToken()
}
ExpressionEvaluator::ExpressionEvaluator(const char *string, Unit const *unit) :
- string(string),
+ string(g_locale_to_utf8(string,-1,0,0,0)),
unit(unit)
{
current_token.type = TOKEN_END;