diff options
| author | Guy M. Broome <thrirhrafnir@gmail.com> | 2018-03-05 16:46:52 -0500 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-04-06 11:13:30 -0300 |
| commit | 0f71db9d8229bd53daa1fbc922ff408bfd44325f (patch) | |
| tree | 7ffd8c04d1c8728d8a81949636ce50823d1a459a | |
| parent | da4010783ef24be1972d68862d84404006a472e4 (diff) | |
Solaris: fix memory allocation for usernames (some empty usernames in 32-bit builds)
| -rw-r--r-- | solaris/SolarisProcessList.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c index d3473e20..66a25a30 100644 --- a/solaris/SolarisProcessList.c +++ b/solaris/SolarisProcessList.c @@ -62,16 +62,6 @@ typedef struct SolarisProcessList_ { }*/ -static void setCommand(Process* process, const char* command, int len) { - if (process->comm && process->commLen >= len) { - strncpy(process->comm, command, len + 1); - } else { - free(process->comm); - process->comm = xStrdup(command); - } - process->commLen = len; -} - char* SolarisProcessList_readZoneName(kstat_ctl_t* kd, SolarisProcess* sproc) { char* zname; if ( sproc->zoneid == 0 ) { @@ -326,7 +316,8 @@ void ProcessList_goThroughEntries(ProcessList* this) { proc->user = UsersTable_getRef(this->usersTable, proc->st_uid); proc->nlwp = _psinfo.pr_nlwp; proc->session = _pstatus.pr_sid; - setCommand(proc,_psinfo.pr_fname,PRFNSZ); + proc->comm = xStrdup(_psinfo.pr_fname); + proc->commLen = strnlen(_psinfo.pr_fname,PRFNSZ); sproc->zname = SolarisProcessList_readZoneName(spl->kd,sproc); proc->majflt = _prusage.pr_majf; proc->minflt = _prusage.pr_minf; @@ -355,7 +346,8 @@ void ProcessList_goThroughEntries(ProcessList* this) { proc->pgrp = _psinfo.pr_pgid; proc->nlwp = _psinfo.pr_nlwp; proc->user = UsersTable_getRef(this->usersTable, proc->st_uid); - setCommand(proc,_psinfo.pr_fname,PRFNSZ); + proc->comm = xStrdup(_psinfo.pr_fname); + proc->commLen = strnlen(_psinfo.pr_fname,PRFNSZ); sproc->zname = SolarisProcessList_readZoneName(spl->kd,sproc); proc->majflt = _prusage.pr_majf; proc->minflt = _prusage.pr_minf; |