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

library: more miscellaneous pids implementation tweaks

Browse Source 
A patch containing the following miscellaneous tweaks:

. make a supposedly robust parameter test truly robust
[ ensure the largest enum value used with validation ]

. remove duplicate item test in cleanup_stack function
[ is already subordinate to test of PROCPS_PIDS_noop ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2015-09-01 00:00:00 -05:00 committed by Craig Small
parent a61f78d6e0
commit 1b38b751ff
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proc/pids.c
View File

@ -739,8 +739,7 @@ static inline void cleanup_stack (
if (p->item < PROCPS_PIDS_noop) { if (p->item < PROCPS_PIDS_noop) {
if (Item_table[p->item].freefunc) if (Item_table[p->item].freefunc)
Item_table[p->item].freefunc(p); Item_table[p->item].freefunc(p);
if (p->item < PROCPS_PIDS_noop) p->result.ull_int = 0;
p->result.ull_int = 0;
} }
++p; ++p;
} }
@ -802,7 +801,7 @@ static inline int items_check_failed (
* ^~~~~~~~~~~~~~~~ * ^~~~~~~~~~~~~~~~
*/ */
if (maxitems < 1 if (maxitems < 1
|| (void *)items < (void *)PROCPS_PIDS_physical_end) || (void *)items < (void *)0x8000) // twice as big as our largest enum
return -1; return -1;
for (i = 0; i < maxitems; i++) { for (i = 0; i < maxitems; i++) {
// a pids_item is currently unsigned, but we'll protect our future // a pids_item is currently unsigned, but we'll protect our future