Merge pull request #40 from wravery/master

Fix #39, plus a lingering short-string-optimization bug
microsoft · Feb 7, 2019 · 7e3acf9 · 7e3acf9
2 parents 25f98da + 4b653f4
commit 7e3acf9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/GraphQLService.cpp b/GraphQLService.cpp
@@ -1082,10 +1082,7 @@ std::future<response::Value> Object::resolve(const SelectionSetParams & selectio
 
 			response::Value result(response::Type::Map);
 
-			if (data.size() > 0)
-			{
-				result.emplace_back(strData, std::move(data));
-			}
+			result.emplace_back(strData, std::move(data));
 
 			if (errors.size() > 0)
 			{

diff --git a/GraphQLTree.cpp b/GraphQLTree.cpp
@@ -659,7 +659,15 @@ ast<const char*>::~ast()
 ast<std::string> parseString(std::string&& input)
 {
 	ast<std::string> result { std::move(input), nullptr };
-	memory_input<> in(result.input.c_str(), result.input.size(), "GraphQL");
+	const size_t length = result.input.size();
+
+	if (length < sizeof(result.input))
+	{
+		// Overflow the short string optimization so it uses a heap allocation.
+		result.input.resize(sizeof(result.input));
+	}
+
+	memory_input<> in(result.input.c_str(), length, "GraphQL");
 
 	result.root = parse_tree::parse<document, ast_node, ast_selector, nothing, ast_control>(std::move(in));
 

diff --git a/include/graphqlservice/GraphQLService.h b/include/graphqlservice/GraphQLService.h
@@ -541,10 +541,7 @@ struct ModifiedResult
 
 				response::Value document(response::Type::Map);
 
-				if (data.size() > 0)
-				{
-					document.emplace_back(strData, std::move(data));
-				}
+				document.emplace_back(strData, std::move(data));
 
 				if (errors.size() > 0)
 				{