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

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).

diff --git a/proc/sig.c b/proc/sig.c
index 6ca9512cc70c1b3e70a683431f3a68417af94b56..0885ff9d65b6d244174aa5e1092c65fa230318ad 100644 (file)
--- a/proc/sig.c
+++ b/proc/sig.c
@@ -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;
       }
     }