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

0067-ps/sortformat.c: Avoid "sep_loc + 1" when sep_loc is NULL.

Browse Source
This commit is contained in:
Qualys Security Advisory 1970-01-01 00:00:00 +00:00 committed by Craig Small
parent f212e552d7
commit 6cf89d5065
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ps/sortformat.c
View File

@ -258,6 +258,7 @@ static const char *format_parse(sf_node *sfn){
format_node *endp; format_node *endp;
char *equal_loc; char *equal_loc;
char *colon_loc; char *colon_loc;
if(!walk) catastrophic_failure(__FILE__, __LINE__, _("please report this bug"));
sep_loc = strpbrk(walk," ,\t\n"); sep_loc = strpbrk(walk," ,\t\n");
/* if items left, then sep_loc is not in header override */ /* if items left, then sep_loc is not in header override */
if(items && sep_loc) *sep_loc = '\0'; if(items && sep_loc) *sep_loc = '\0';
@ -300,7 +301,7 @@ static const char *format_parse(sf_node *sfn){
endp = fnode; while(endp->next) endp = endp->next; /* find end */ endp = fnode; while(endp->next) endp = endp->next; /* find end */
endp->next = sfn->f_cooked; endp->next = sfn->f_cooked;
sfn->f_cooked = fnode; sfn->f_cooked = fnode;
walk = sep_loc + 1; /* point to next item, if any */ walk = sep_loc ? sep_loc + 1 : NULL; /* point to next item, if any */
} }
free(buf); free(buf);
already_parsed_format = 1; already_parsed_format = 1;