emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: slab sort derefence after check

Browse Source 
procps_slabnode_stacks_sort() would check if stacks was NULL
*after* the pointer was derefenced in the initialisation of
the variable p.

p is now assigned after the check.

References:
 Coverity #99160
This commit is contained in:
Craig Small 2016-05-14 22:32:35 +10:00
parent 2e6435a39d
commit 4f6b8c9c60
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proc/slab.c
View File

@ -836,11 +836,12 @@ PROCPS_EXPORT struct slabnode_stack **procps_slabnode_stacks_sort (
enum slabnode_item sort) enum slabnode_item sort)
{ {
#define QSORT_r int (*)(const void *, const void *, void *) #define QSORT_r int (*)(const void *, const void *, void *)
struct slab_result *p = stacks[0]->head; struct slab_result *p;
int offset = 0;; int offset = 0;;
if (info == NULL || stacks == NULL) if (info == NULL || stacks == NULL)
return NULL; return NULL;
if (sort < 0 || sort > PROCPS_SLABNODE_noop) if (sort < 0 || sort > PROCPS_SLABNODE_noop)
return NULL; return NULL;
if (numstacked > info->stacked->depth) if (numstacked > info->stacked->depth)
@ -851,6 +852,7 @@ PROCPS_EXPORT struct slabnode_stack **procps_slabnode_stacks_sort (
if (numstacked > info->stacked->inuse) if (numstacked > info->stacked->inuse)
numstacked = info->stacked->inuse; numstacked = info->stacked->inuse;
p = stacks[0]->head;
for (;;) { for (;;) {
if (p->item == sort) if (p->item == sort)
break; break;