commit bc5f79b95c5f809635bc84dbdd3010350bfbc269 Author: Neel Chauhan neel@neelc.org Date: Mon Mar 19 12:27:07 2018 -0400
Use tor_asprintf for in have_enough_mem_for_dircache()
(Fixes bug 20887) --- changes/bug20887 | 4 ++++ src/or/config.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/changes/bug20887 b/changes/bug20887 new file mode 100644 index 000000000..5d4e4ed23 --- /dev/null +++ b/changes/bug20887 @@ -0,0 +1,4 @@ + o Minor bugfixes (freebsd): + - In have_enough_mem_for_dircache(), the variable DIRCACHE_MIN_MEM_MB + does not stringify on FreeBSD, so we switch to tor_asprintf(). Fixes + bug 20887; bugfix on 0.2.8.1-alpha. Patch by Neel Chauhan. diff --git a/src/or/config.c b/src/or/config.c index 0b161554c..212c6c6b9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4625,15 +4625,14 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem, if (options->DirCache) { if (total_mem < DIRCACHE_MIN_MEM_BYTES) { if (options->BridgeRelay) { - *msg = tor_strdup("Running a Bridge with less than " - STRINGIFY(DIRCACHE_MIN_MEM_MB) " MB of memory is not " - "recommended."); + tor_asprintf(msg, "Running a Bridge with less than %d MB of memory " + "is not recommended.", DIRCACHE_MIN_MEM_MB); } else { - *msg = tor_strdup("Being a directory cache (default) with less than " - STRINGIFY(DIRCACHE_MIN_MEM_MB) " MB of memory is not " - "recommended and may consume most of the available " - "resources, consider disabling this functionality by " - "setting the DirCache option to 0."); + tor_asprintf(msg, "Being a directory cache (default) with less than " + "%d MB of memory is not recommended and may consume " + "most of the available resources. Consider disabling " + "this functionality by setting the DirCache option " + "to 0.", DIRCACHE_MIN_MEM_MB); } } } else {