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

proc/sig.c: Fix the strtosig() function.

Browse Source 
Do not memleak "copy" in case of an error.

Do not use "sizeof(converted)" in snprintf(), since "converted" is a
"char *" (luckily, 8 >= sizeof(char *)). Also, remove "sizeof(char)"
which is guaranteed to be 1 by the C standard, and replace 8 with 12,
which is enough to hold any stringified int and does not consume more
memory (in both cases, the glibc malloc()ates a minimum-sized chunk).
This commit is contained in:
Qualys Security Advisory 1970-01-01 00:00:00 +00:00 committed by Craig Small
parent 7367c4b1fd
commit 3ce9f837a3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proc/sig.c
View File

@ -264,7 +264,10 @@ char *strtosig(const char *restrict s){
p += 3;
if (isdigit(*p)){
numsignal = strtol(s,&endp,10);
if(*endp || endp==s) return NULL; /* not valid */
if(*endp || endp==s){ /* not valid */
free(copy);
return NULL;
}
}
if (numsignal){
for (i = 0; i < number_of_signals; i++){
@ -276,9 +279,9 @@ char *strtosig(const char *restrict s){
} else {
for (i = 0; i < number_of_signals; i++){
if (strcmp(p, sigtable[i].name) == 0){
converted = malloc(sizeof(char) * 8);
converted = malloc(12);
if (converted)
snprintf(converted, sizeof(converted) - 1, "%d", sigtable[i].num);
snprintf(converted, 12, "%d", sigtable[i].num);
break;
}
}