Merge pull request #2353 from mgreter/bugfix/issue-2352

Fix segfault for varargs with non-string keys

Author: mgreter

src/bind.cpp

@@ -95,13 +95,17 @@ namespace Sass {
           env->local_frame()[p->name()] = arglist;
           Map_Obj argmap = Cast<Map>(a->value());
           for (auto key : argmap->keys()) {
-            std::string param = unquote(Cast<String_Constant>(key)->value());
-            arglist->append(SASS_MEMORY_NEW(Argument,
-                                            key->pstate(),
-                                            argmap->at(key),
-                                            "$" + param,
-                                            false,
-                                            false));
+            if (String_Constant_Obj str = Cast<String_Constant>(key)) {
+              std::string param = unquote(str->value());
+              arglist->append(SASS_MEMORY_NEW(Argument,
+                                              key->pstate(),
+                                              argmap->at(key),
+                                              "$" + param,
+                                              false,
+                                              false));
+            } else {
+              throw Exception::InvalidVarKwdType(key->pstate(), key->inspect(), a);
+            }
           }
 
         } else {

src/error_handling.cpp

@@ -31,6 +31,13 @@ namespace Sass {
       msg += "\"";
     }
 
+    InvalidVarKwdType::InvalidVarKwdType(ParserState pstate, std::string name, const Argument_Ptr arg)
+    : Base(pstate), name(name), arg(arg)
+    {
+      msg = "Variable keyword argument map must have string keys.\n";
+      msg += name + " is not a string in " + arg->to_string() + ".";
+    }
+
     InvalidArgumentType::InvalidArgumentType(ParserState pstate, std::string fn, std::string arg, std::string type, const Value_Ptr value)
     : Base(pstate), fn(fn), arg(arg), type(type), value(value)
     {

src/error_handling.hpp

@@ -68,6 +68,15 @@ namespace Sass {
         virtual ~InvalidArgumentType() throw() {};
     };
 
+    class InvalidVarKwdType : public Base {
+      protected:
+        std::string name;
+        const Argument_Ptr arg;
+      public:
+        InvalidVarKwdType(ParserState pstate, std::string name, const Argument_Ptr arg = 0);
+        virtual ~InvalidVarKwdType() throw() {};
+    };
+
     class InvalidSyntax : public Base {
       public:
         InvalidSyntax(ParserState pstate, std::string msg, std::vector<Sass_Import_Entry>* import_stack = 0);