Ticket #3225: wseh.cpp.patch

source/lib/sysdep/os/win/wseh.cpp

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2015 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -370 +370 @@
 {
     if(argc == 0)
         return EXIT_FAILURE;    // ensure &utf8_argv[0] is safe
+
     std::vector<char*> utf8_argv(argc);
+    std::string buffer;
+ 
+    char* p = (char*) 1;
     for(int i = 0; i < argc; i++)
     {
-        std::string utf8 = utf8_from_wstring(argv[i]);
-        utf8_argv[i] = strdup(utf8.c_str());
+        buffer += "_" + utf8_from_wstring(argv[i]);
+        *(&buffer.at(0) + (int)p - 1) = '\x0';
+        utf8_argv[i] = p;
+        p = (char*)buffer.length() + 1;
     }
 
+    p = &buffer.at(0);
+    for (int i = 0; i < argc; i++)
+        utf8_argv[i] = p + (int)utf8_argv[i];
+
     const int ret = main(argc, &utf8_argv[0]);
 
-    for(int i = 0; i < argc; i++)
-        free(utf8_argv[i]);
     return ret;
 }