From 3ed7ae0bd95196f977f3295e7fc3659a7157481d Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Fri, 10 Oct 2014 13:54:53 +0000
Subject: [PATCH] Oops; fix memory leak

---
 dtool/src/dtoolutil/executionEnvironment.cxx | 29 ++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/dtool/src/dtoolutil/executionEnvironment.cxx b/dtool/src/dtoolutil/executionEnvironment.cxx
index fac9475d46..2d970c789e 100644
--- a/dtool/src/dtoolutil/executionEnvironment.cxx
+++ b/dtool/src/dtoolutil/executionEnvironment.cxx
@@ -771,22 +771,29 @@ read_args() {
 
   LPWSTR cmdline = GetCommandLineW();
   int argc = 0;
-  LPWSTR *argv = CommandLineToArgvW(cmdline, &argc);
+  LPWSTR *wargv = CommandLineToArgvW(cmdline, &argc);
 
-  TextEncoder encoder;
-  encoder.set_encoding(Filename::get_filesystem_encoding());
+  if (wargv == NULL) {
+    cerr << "CommandLineToArgvW failed; command-line arguments unavailable to config.\n";
 
-  for (int i = 0; i < argc; ++i) {
-    wstring wtext(argv[i]);
-    encoder.set_wtext(wtext);
+  } else {
+    TextEncoder encoder;
+    encoder.set_encoding(Filename::get_filesystem_encoding());
 
-    if (i == 0) {
-      if (_binary_name.empty()) {
-        _binary_name = encoder.get_text();
+    for (int i = 0; i < argc; ++i) {
+      wstring wtext(wargv[i]);
+      encoder.set_wtext(wtext);
+
+      if (i == 0) {
+        if (_binary_name.empty()) {
+          _binary_name = encoder.get_text();
+        }
+      } else {
+        _args.push_back(encoder.get_text());
       }
-    } else {
-      _args.push_back(encoder.get_text());
     }
+
+    LocalFree(wargv);
   }
 
 #elif defined(IS_FREEBSD)