Add local unaware atof function

Fixes sass#923
mgreter · Mar 9, 2015 · 14bfd99 · 14bfd99
1 parent 21ce837
commit 14bfd99
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/eval.cpp b/eval.cpp
@@ -658,19 +658,19 @@ namespace Sass {
     {
       case Textual::NUMBER:
         result = new (ctx.mem) Number(t->pstate(),
-                                      atof(num.c_str()),
+                                      sass_atof(num.c_str()),
                                       "",
                                       zero);
         break;
       case Textual::PERCENTAGE:
         result = new (ctx.mem) Number(t->pstate(),
-                                      atof(num.c_str()),
+                                      sass_atof(num.c_str()),
                                       "%",
                                       zero);
         break;
       case Textual::DIMENSION:
         result = new (ctx.mem) Number(t->pstate(),
-                                      atof(num.c_str()),
+                                      sass_atof(num.c_str()),
                                       Token(number(text.c_str()), t->pstate()),
                                       zero);
         break;

diff --git a/util.cpp b/util.cpp
@@ -21,6 +21,16 @@ namespace Sass {
     return ret;
   }
 
+  /* Locale unspecific atof function. */
+  double sass_atof(const char *str)
+  {
+    char* locale = setlocale(LC_NUMERIC, NULL);
+    setlocale(LC_NUMERIC, "C");
+    double val = atof(str);
+    setlocale(LC_NUMERIC, locale);
+    return val;
+  }
+
   // double escape every escape sequences
   // escape unescaped quotes and backslashes
   string string_escape(const string& str)

diff --git a/util.hpp b/util.hpp
@@ -9,6 +9,7 @@ namespace Sass {
   using namespace std;
 
   char* sass_strdup(const char* str);
+  double sass_atof(const char* str);
   string string_escape(const string& str);
   string string_unescape(const string& str);
   string evacuate_quotes(const string& str);