bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(SIGAR-168) always fallback to wmi when peb fails for proc_args

This commit is contained in:
Doug MacEachern 2009-09-01 14:09:46 -07:00
parent 0b335d9025
commit c88b49abe2
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/win32/peb.c
View File

@ -171,15 +171,16 @@ int sigar_proc_args_peb_get(sigar_t *sigar, HANDLE proc,
} }
size = rtl_bufsize(buf, rtl.CommandLine); size = rtl_bufsize(buf, rtl.CommandLine);
if (size <= 0) {
return ERROR_DATATYPE_MISMATCH; /* fallback to wmi */
}
memset(buf, '\0', sizeof(buf)); memset(buf, '\0', sizeof(buf));
if ((size > 0) && if (ReadProcessMemory(proc, rtl.CommandLine.Buffer, buf, size, NULL)) {
ReadProcessMemory(proc, rtl.CommandLine.Buffer, buf, size, NULL))
{
return sigar_parse_proc_args(sigar, buf, procargs); return sigar_parse_proc_args(sigar, buf, procargs);
} }
else { else {
return SIGAR_OK; return GetLastError();
} }
} }

22
src/os/win32/win32_sigar.c
View File

@ -1434,20 +1434,18 @@ static int sigar_remote_proc_args_get(sigar_t *sigar, sigar_pid_t pid,
char cmdline[SIGAR_CMDLINE_MAX], *ptr = cmdline, *arg; char cmdline[SIGAR_CMDLINE_MAX], *ptr = cmdline, *arg;
HANDLE proc = open_process(pid); HANDLE proc = open_process(pid);
if (!proc) { if (proc) {
return GetLastError(); status = sigar_proc_args_peb_get(sigar, proc, procargs);
CloseHandle(proc);
if (status == SIGAR_OK) {
return status;
}
} }
status = sigar_proc_args_peb_get(sigar, proc, procargs); /* likely we are 32-bit, pid process is 64-bit */
return sigar_proc_args_wmi_get(sigar, pid, procargs);
CloseHandle(proc);
if (status == ERROR_DATATYPE_MISMATCH) {
/* we are 32-bit, pid process is 64-bit */
status = sigar_proc_args_wmi_get(sigar, pid, procargs);
}
return status;
} }
int sigar_os_proc_args_get(sigar_t *sigar, sigar_pid_t pid, int sigar_os_proc_args_get(sigar_t *sigar, sigar_pid_t pid,