TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Oops; fix memory leak

Browse Source
This commit is contained in:
rdb 2014-10-10 13:54:53 +00:00
parent 902bedc314
commit 3ed7ae0bd9
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dtool/src/dtoolutil/executionEnvironment.cxx
View File

@ -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)