CPP-807 - Handle varying encoded UTF configuration files (#281)

Author: mikefero

cpp-driver/src/cloud_secure_connection_config.cpp

@@ -237,8 +237,10 @@ bool CloudSecureConnectionConfig::load(const String& filename, Config* config /*
     return false;
   }
 
+  json::MemoryStream memory_stream(contents.c_str(), contents.size());
+  json::AutoUTFMemoryInputStream auto_utf_stream(memory_stream);
   json::Document document;
-  document.Parse(contents.c_str());
+  document.ParseStream(auto_utf_stream);
   if (!document.IsObject()) {
     LOG_ERROR(CLOUD_ERROR "Invalid configuration");
     return false;

cpp-driver/src/json.hpp

@@ -73,10 +73,12 @@ class Allocator {
 
 typedef datastax::rapidjson::UTF8<> UTF8;
 typedef datastax::rapidjson::MemoryPoolAllocator<json::Allocator> MemoryPoolAllocator;
+typedef datastax::rapidjson::MemoryStream MemoryStream;
 
 typedef datastax::rapidjson::GenericDocument<UTF8, MemoryPoolAllocator, json::Allocator> Document;
 typedef datastax::rapidjson::GenericValue<UTF8, MemoryPoolAllocator> Value;
 typedef datastax::rapidjson::GenericStringBuffer<UTF8, json::Allocator> StringBuffer;
+typedef datastax::rapidjson::AutoUTFInputStream<unsigned, MemoryStream> AutoUTFMemoryInputStream;
 
 template <typename OutputStream, typename SourceEncoding = UTF8, typename TargetEncoding = UTF8,
           typename StackAllocator = json::Allocator,