comparison src/vamp-hostsdk/PluginLoader.cpp @ 331:9648ba9812d6

Apply vamp-2.3-windows-unicode.patch from RJ Ryan in #464

 PluginLoader::Impl::loadLibrary(string path)
 {
     void *handle = 0;
 #ifdef _WIN32
 #ifdef UNICODE
-    int len = path.length(); // cannot be more wchars than length in bytes of utf8 string
+    int len = path.length() + 1; // cannot be more wchars than length in bytes of utf8 string
     wchar_t *buffer = new wchar_t[len];
     int rv = MultiByteToWideChar(CP_UTF8, 0, path.c_str(), len, buffer, len);
     if (rv <= 0) {
         cerr << "Vamp::HostExt::PluginLoader: Unable to convert library path \""
              << path << "\" to wide characters " << endl;

     vector<string> files;
 
 #ifdef _WIN32
     string expression = dir + "\\*." + extension;
 #ifdef UNICODE
-    int len = expression.length(); // cannot be more wchars than length in bytes of utf8 string
+    int len = expression.length() + 1; // cannot be more wchars than length in bytes of utf8 string
     wchar_t *buffer = new wchar_t[len];
     int rv = MultiByteToWideChar(CP_UTF8, 0, expression.c_str(), len, buffer, len);
     if (rv <= 0) {
         cerr << "Vamp::HostExt::PluginLoader: Unable to convert wildcard path \""
              << expression << "\" to wide characters" << endl;

     }
 
     bool ok = true;
     while (ok) {
         wchar_t *fn = data.cFileName;
-        int wlen = wcslen(fn);
+        int wlen = wcslen(fn) + 1;
         int maxlen = wlen * 6;
         char *conv = new char[maxlen];
         int rv = WideCharToMultiByte(CP_UTF8, 0, fn, wlen, conv, maxlen, 0, 0);
         if (rv > 0) {
             files.push_back(conv);