From d1a5c52851e0560eb02da0a02cd00d0abc1700d3 Mon Sep 17 00:00:00 2001 From: Alex Hornung Date: Sun, 16 Mar 2014 13:45:21 +0000 Subject: [PATCH] cryptdisks safe_mem - use weak symbols * Use weak symbols so that the ones in libtcplay.a can override the symbols in the local safe_mem. * I'm not sure why this ever worked before, but it definitely doesn't work anymore. --- sbin/cryptdisks/safe_mem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/cryptdisks/safe_mem.c b/sbin/cryptdisks/safe_mem.c index 906f3fd51c..8515776ed1 100644 --- a/sbin/cryptdisks/safe_mem.c +++ b/sbin/cryptdisks/safe_mem.c @@ -50,6 +50,7 @@ struct safe_mem_tail { static struct safe_mem_hdr *safe_mem_hdr_first = NULL; +#pragma weak _alloc_safe_mem void * _alloc_safe_mem(size_t req_sz, const char *file, int line) { @@ -94,6 +95,7 @@ _alloc_safe_mem(size_t req_sz, const char *file, int line) return user_mem; } +#pragma weak _free_safe_mem void _free_safe_mem(void *mem_ptr, const char *file, int line) { @@ -144,6 +146,7 @@ _free_safe_mem(void *mem_ptr, const char *file, int line) free(mem); } +#pragma weak check_and_purge_safe_mem void check_and_purge_safe_mem(void) { -- 2.41.0