-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CRT] Always initialize _[w]pgmptr with a *FULL* path to the current …
…application. Otherwise fall back to the computed argv[0]. This is expected by some applications, for example Git. Code is adapted from Wine. Many thanks to Stanislav Motylkov for having investigated this bug! CORE-12931 CORE-13892 CORE-13898 CORE-14066
- Loading branch information
Showing
1 changed file
with
32 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -208,7 +208,7 @@ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, i | |
len = strlen(_acmdln); | ||
buffer = malloc(sizeof(char) * len); | ||
|
||
// Reference: https://msdn.microsoft.com/en-us/library/a1y7w461(v=vs.71).aspx | ||
// Reference: https://msdn.microsoft.com/en-us/library/a1y7w461.aspx | ||
while (TRUE) | ||
{ | ||
// Arguments are delimited by white space, which is either a space or a tab. | ||
|
@@ -294,7 +294,6 @@ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, i | |
|
||
/* Free the temporary buffer. */ | ||
free(buffer); | ||
HeapValidate(GetProcessHeap(), 0, NULL); | ||
|
||
*argc = __argc; | ||
if (__argv == NULL) | ||
|
@@ -304,7 +303,21 @@ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, i | |
} | ||
*argv = __argv; | ||
*env = _environ; | ||
_pgmptr = _strdup(__argv[0]); | ||
|
||
_pgmptr = malloc(MAX_PATH * sizeof(char)); | ||
if (_pgmptr) | ||
{ | ||
if (!GetModuleFileNameA(NULL, _pgmptr, MAX_PATH)) | ||
_pgmptr[0] = '\0'; | ||
else | ||
_pgmptr[MAX_PATH - 1] = '\0'; | ||
} | ||
else | ||
{ | ||
_pgmptr = _strdup(__argv[0]); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
HBelusca
Author
Contributor
|
||
} | ||
|
||
HeapValidate(GetProcessHeap(), 0, NULL); | ||
|
||
// if (new_mode) _set_new_mode(*new_mode); | ||
} | ||
|
@@ -342,7 +355,7 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, | |
len = wcslen(_wcmdln); | ||
buffer = malloc(sizeof(wchar_t) * len); | ||
|
||
// Reference: https://msdn.microsoft.com/en-us/library/a1y7w461(v=vs.71).aspx | ||
// Reference: https://msdn.microsoft.com/en-us/library/a1y7w461.aspx | ||
while (TRUE) | ||
{ | ||
// Arguments are delimited by white space, which is either a space or a tab. | ||
|
@@ -429,8 +442,6 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, | |
/* Free the temporary buffer. */ | ||
free(buffer); | ||
|
||
HeapValidate(GetProcessHeap(), 0, NULL); | ||
|
||
*argc = __argc; | ||
if (__wargv == NULL) | ||
{ | ||
|
@@ -439,7 +450,21 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, | |
} | ||
*wargv = __wargv; | ||
*wenv = __winitenv; | ||
_wpgmptr = _wcsdup(__wargv[0]); | ||
|
||
_wpgmptr = malloc(MAX_PATH * sizeof(wchar_t)); | ||
if (_wpgmptr) | ||
{ | ||
if (!GetModuleFileNameW(NULL, _wpgmptr, MAX_PATH)) | ||
_wpgmptr[0] = '\0'; | ||
else | ||
_wpgmptr[MAX_PATH - 1] = '\0'; | ||
} | ||
else | ||
{ | ||
_wpgmptr = _wcsdup(__wargv[0]); | ||
} | ||
|
||
HeapValidate(GetProcessHeap(), 0, NULL); | ||
|
||
// if (new_mode) _set_new_mode(*new_mode); | ||
} | ||
|
@HBelusca, so
malloc
might returnNULL
(I guess if it is not able to allocate memory), but you expect_strdup
to succeed and do not check what it returns?As I understand
_strdup
is a wrapper formalloc
+strcpy
:reactos/sdk/lib/crt/string/strdup.c
Lines 7 to 17 in c2c66af
Why this way to handle malloc is sufficient? Looks like it would make future debugging even harder.