oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

roken: Quiet warnings at mergesort callers

Browse Source 
Some static analyzers can't tell that mergesort_r() isn't outputting
freed memory.
This commit is contained in:
Nicolas Williams
2023-01-03 20:18:17 -06:00
parent aee72d61bf
commit 7c3a064764
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/roken/mergesort_r.c
View File

@@ -100,6 +100,7 @@ mergesort_r(void *base, size_t nmemb, size_t size, cmp_t cmp, void *thunk)
int big, iflag; int big, iflag;
u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
u_char *list2, *list1, *p2, *p, *last, **p1; u_char *list2, *list1, *p2, *p, *last, **p1;
u_char *freeme = NULL;
if (size < PSIZE / 2) { /* Pointers must fit into 2 * size. */ if (size < PSIZE / 2) { /* Pointers must fit into 2 * size. */
errno = EINVAL; errno = EINVAL;
@@ -117,7 +118,7 @@ mergesort_r(void *base, size_t nmemb, size_t size, cmp_t cmp, void *thunk)
if (!(size % ISIZE) && !(((uintptr_t)base) % ISIZE)) if (!(size % ISIZE) && !(((uintptr_t)base) % ISIZE))
iflag = 1; iflag = 1;
if ((list2 = malloc(nmemb * size + PSIZE)) == NULL) if ((list2 = freeme = malloc(nmemb * size + PSIZE)) == NULL)
return (-1); return (-1);
list1 = base; list1 = base;
@@ -219,11 +220,9 @@ COPY: b = t;
list2 = tp2; list2 = tp2;
last = list2 + nmemb*size; last = list2 + nmemb*size;
} }
if (base == list2) { if (base == list2)
memmove(list2, list1, nmemb*size); memmove(list2, list1, nmemb*size);
list2 = list1; free(freeme);
}
free(list2);
return (0); return (0);
} }