Module Name: src Committed By: rillig Date: Sun Aug 30 13:53:02 UTC 2020
Modified Files: src/usr.bin/make: job.c Log Message: make(1): remove ineffective malloc_options variable According to jemalloc(3), the variable must be called _malloc_options, with a leading underscore, to have an effect. Renaming the variable indeed enables the option. There's not much point having this variable around though, since it neither detects a trivial double-free nor freeing an invalid pointer in the following code snippet: char *asdf = bmake_malloc(10); fprintf(stderr, "%c\n", *asdf); free(asdf + 8); free(asdf); free(asdf); exit(1); Instead, it just crashes with a segmentation fault. To generate a diff of this commit: cvs rdiff -u -r1.225 -r1.226 src/usr.bin/make/job.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/job.c diff -u src/usr.bin/make/job.c:1.225 src/usr.bin/make/job.c:1.226 --- src/usr.bin/make/job.c:1.225 Sun Aug 30 11:12:05 2020 +++ src/usr.bin/make/job.c Sun Aug 30 13:53:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.225 2020/08/30 11:12:05 rillig Exp $ */ +/* $NetBSD: job.c,v 1.226 2020/08/30 13:53:02 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.225 2020/08/30 11:12:05 rillig Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.226 2020/08/30 13:53:02 rillig Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.225 2020/08/30 11:12:05 rillig Exp $"); +__RCSID("$NetBSD: job.c,v 1.226 2020/08/30 13:53:02 rillig Exp $"); #endif #endif /* not lint */ #endif @@ -352,8 +352,6 @@ static void JobSigLock(sigset_t *); static void JobSigUnlock(sigset_t *); static void JobSigReset(void); -const char *malloc_options MAKE_ATTR_UNUSED = "A"; /* see jemalloc(3) */ - static unsigned nfds_per_job(void) {