system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 12:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd: Fixed 3 buffer overflows when fetching environment variables.

Browse source
This commit is contained in:
Alexander Farber 2007-02-28 15:23:15 +01:00 committed by Alexandre Julliard
parent 23473ccc9e
commit fdeb6d5ae5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
programs/cmd/wcmdmain.c
View file

@ -672,6 +672,7 @@ void WCMD_run_program (char *command, int called) {
BOOL extensionsupplied = FALSE;
BOOL launched = FALSE;
BOOL status;
DWORD len;
WCMD_parse (command, quals, param1, param2); /* Quick way to get the filename */
@ -681,8 +682,8 @@ void WCMD_run_program (char *command, int called) {
/* Calculate the search path and stem to search for */
if (strpbrk (param1, "/\\:") == NULL) { /* No explicit path given, search path */
strcpy(pathtosearch,".;");
status = GetEnvironmentVariable ("PATH", &pathtosearch[2], sizeof(pathtosearch)-2);
if ((status == 0) || (status > sizeof(pathtosearch))) {
len = GetEnvironmentVariable ("PATH", &pathtosearch[2], sizeof(pathtosearch)-2);
if ((len == 0) || (len >= sizeof(pathtosearch) - 2)) {
lstrcpy (pathtosearch, ".");
}
if (strchr(param1, '.') != NULL) extensionsupplied = TRUE;
@ -699,8 +700,8 @@ void WCMD_run_program (char *command, int called) {
}
/* Now extract PATHEXT */
status = GetEnvironmentVariable ("PATHEXT", pathext, sizeof(pathext));
if ((status == 0) || (status > sizeof(pathext))) {
len = GetEnvironmentVariable ("PATHEXT", pathext, sizeof(pathext));
if ((len == 0) || (len >= sizeof(pathext))) {
lstrcpy (pathext, ".bat;.com;.cmd;.exe");
}
@ -857,9 +858,10 @@ void WCMD_show_prompt (void) {
int status;
char out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH];
char *p, *q;
DWORD len;
status = GetEnvironmentVariable ("PROMPT", prompt_string, sizeof(prompt_string));
if ((status == 0) || (status > sizeof(prompt_string))) {
len = GetEnvironmentVariable ("PROMPT", prompt_string, sizeof(prompt_string));
if ((len == 0) || (len >= sizeof(prompt_string))) {
lstrcpy (prompt_string, "$P$G");
}
p = prompt_string;