X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fmem_dbg.c;h=139cfe1794a6bf6949b182f83581691a0f761742;hb=da29b0d3357b54d859f690b4d7ba3be7210d5b11;hp=939cee1aee0655a72950642b4f47b64158910627;hpb=3c1d6bbc9242900af0e5db927fdcda38539bd54a;p=oweals%2Fopenssl.git diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 939cee1aee..139cfe1794 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -197,7 +197,8 @@ static unsigned int num_disable = 0; /* num_disable > 0 */ /* Valid iff num_disable > 0. CRYPTO_LOCK_MALLOC2 is locked exactly in this - * case (by the thread named in disabling_threadid). */ + * case (by the thread named in disabling_thread). + */ static CRYPTO_THREADID disabling_threadid; static void app_info_free(APP_INFO *inf) @@ -235,10 +236,9 @@ int CRYPTO_mem_ctrl(int mode) case CRYPTO_MEM_CHECK_DISABLE: /* aka MemCheck_off() */ if (mh_mode & CRYPTO_MEM_CHECK_ON) { - CRYPTO_THREADID tid; - CRYPTO_THREADID_set(&tid); - if (!num_disable || CRYPTO_THREADID_cmp(&tid, - &disabling_threadid)) + CRYPTO_THREADID cur; + CRYPTO_THREADID_current(&cur); + if (!num_disable || CRYPTO_THREADID_cmp(&disabling_threadid, &cur)) /* otherwise we already have the MALLOC2 lock */ { /* Long-time lock CRYPTO_LOCK_MALLOC2 must not be claimed while * we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if @@ -256,7 +256,7 @@ int CRYPTO_mem_ctrl(int mode) CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2); CRYPTO_w_lock(CRYPTO_LOCK_MALLOC); mh_mode &= ~CRYPTO_MEM_CHECK_ENABLE; - CRYPTO_THREADID_set(&disabling_threadid); + CRYPTO_THREADID_cpy(&disabling_threadid, &cur); } num_disable++; } @@ -289,12 +289,12 @@ int CRYPTO_is_mem_check_on(void) if (mh_mode & CRYPTO_MEM_CHECK_ON) { - CRYPTO_THREADID tid; - CRYPTO_THREADID_set(&tid); + CRYPTO_THREADID cur; + CRYPTO_THREADID_current(&cur); CRYPTO_r_lock(CRYPTO_LOCK_MALLOC); - ret = (mh_mode & CRYPTO_MEM_CHECK_ENABLE) || - CRYPTO_THREADID_cmp(&tid, &disabling_threadid); + ret = (mh_mode & CRYPTO_MEM_CHECK_ENABLE) + || CRYPTO_THREADID_cmp(&disabling_threadid, &cur); CRYPTO_r_unlock(CRYPTO_LOCK_MALLOC); } @@ -315,10 +315,10 @@ long CRYPTO_dbg_get_options(void) static int mem_cmp(const MEM *a, const MEM *b) { #ifdef _WIN64 - const char *a=(const char *)a->addr, - *b=(const char *)b->addr; - if (a==b) return 0; - else if (a>b) return 1; + const char *ap=(const char *)a->addr, + *bp=(const char *)b->addr; + if (ap==bp) return 0; + else if (ap>bp) return 1; else return -1; #else return (const char *)a->addr - (const char *)b->addr; @@ -348,7 +348,9 @@ static IMPLEMENT_LHASH_COMP_FN(app_info, APP_INFO) static unsigned long app_info_hash(const APP_INFO *a) { unsigned long ret; + ret = CRYPTO_THREADID_hash(&a->threadid); + /* This is left in as a "who am I to question legacy?" measure */ ret=ret*17851+(ret>>14)*7+(ret>>4)*251; return(ret); } @@ -361,7 +363,7 @@ static APP_INFO *pop_info(void) if (amih != NULL) { - CRYPTO_THREADID_set(&tmp.threadid); + CRYPTO_THREADID_current(&tmp.threadid); if ((ret=lh_APP_INFO_delete(amih,&tmp)) != NULL) { APP_INFO *next=ret->next; @@ -369,7 +371,7 @@ static APP_INFO *pop_info(void) if (next != NULL) { next->references++; - lh_APP_INFO_insert(amih,next); + (void)lh_APP_INFO_insert(amih,next); } #ifdef LEVITTE_DEBUG_MEM if (CRYPTO_THREADID_cmp(&ret->threadid, &tmp.threadid)) @@ -416,7 +418,7 @@ int CRYPTO_push_info_(const char *info, const char *file, int line) } } - CRYPTO_THREADID_set(&ami->threadid); + CRYPTO_THREADID_current(&ami->threadid); ami->file=file; ami->line=line; ami->info=info; @@ -515,7 +517,10 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, m->file=file; m->line=line; m->num=num; - CRYPTO_THREADID_set(&m->threadid); + if (options & V_CRYPTO_MDEBUG_THREAD) + CRYPTO_THREADID_current(&m->threadid); + else + memset(&m->threadid, 0, sizeof(m->threadid)); if (order == break_order_num) { @@ -534,7 +539,7 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, else m->time=0; - CRYPTO_THREADID_set(&m->threadid); + CRYPTO_THREADID_current(&tmp.threadid); m->app_info=NULL; if (amih != NULL && (amim=lh_APP_INFO_retrieve(amih,&tmp)) != NULL) @@ -637,7 +642,7 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, #endif mp->addr=addr2; mp->num=num; - lh_MEM_insert(mh,mp); + (void)lh_MEM_insert(mh,mp); } MemCheck_on(); /* release MALLOC2 lock @@ -663,7 +668,7 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l) APP_INFO *amip; int ami_cnt; struct tm *lcl = NULL; - CRYPTO_THREADID tid; + CRYPTO_THREADID ti; #define BUF_REMAIN (sizeof buf - (size_t)(bufp - buf)) @@ -703,8 +708,8 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l) ami_cnt=0; if (!amip) return; - CRYPTO_THREADID_set(&tid); - + CRYPTO_THREADID_cpy(&ti, &amip->threadid); + do { int buf_len; @@ -714,7 +719,8 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l) memset(buf,'>',ami_cnt); BIO_snprintf(buf + ami_cnt, sizeof buf - ami_cnt, " thread=%lu, file=%s, line=%d, info=\"", - CRYPTO_THREADID_hash(&amip->threadid), amip->file, amip->line); + CRYPTO_THREADID_hash(&amip->threadid), amip->file, + amip->line); buf_len=strlen(buf); info_len=strlen(amip->info); if (128 - buf_len - 3 < info_len) @@ -734,7 +740,7 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l) amip = amip->next; } - while(amip && !CRYPTO_THREADID_cmp(&amip->threadid, &tid)); + while(amip && !CRYPTO_THREADID_cmp(&amip->threadid, &ti)); #ifdef LEVITTE_DEBUG_MEM if (amip) @@ -766,6 +772,9 @@ void CRYPTO_mem_leaks(BIO *b) { BIO_printf(b,"%ld bytes leaked in %d chunks\n", ml.bytes,ml.chunks); +#ifdef CRYPTO_MDEBUG_ABORT + abort(); +#endif } else { @@ -840,18 +849,26 @@ void CRYPTO_mem_leaks_fp(FILE *fp) /* NB: The prototypes have been typedef'd to CRYPTO_MEM_LEAK_CB inside crypto.h * If this code is restructured, remove the callback type if it is no longer * needed. -- Geoff Thorpe */ -static void cb_leak_doall_arg(const MEM *m, CRYPTO_MEM_LEAK_CB *cb) + +/* Can't pass CRYPTO_MEM_LEAK_CB directly to lh_MEM_doall_arg because it + * is a function pointer and conversion to void * is prohibited. Instead + * pass its address + */ + +typedef CRYPTO_MEM_LEAK_CB *PCRYPTO_MEM_LEAK_CB; + +static void cb_leak_doall_arg(const MEM *m, PCRYPTO_MEM_LEAK_CB *cb) { - cb(m->order,m->file,m->line,m->num,m->addr); + (*cb)(m->order,m->file,m->line,m->num,m->addr); } -static IMPLEMENT_LHASH_DOALL_ARG_FN(cb_leak, const MEM, CRYPTO_MEM_LEAK_CB) +static IMPLEMENT_LHASH_DOALL_ARG_FN(cb_leak, const MEM, PCRYPTO_MEM_LEAK_CB) void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb) { if (mh == NULL) return; CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2); - lh_MEM_doall_arg(mh, LHASH_DOALL_ARG_FN(cb_leak), CRYPTO_MEM_LEAK_CB, - cb); + lh_MEM_doall_arg(mh, LHASH_DOALL_ARG_FN(cb_leak), PCRYPTO_MEM_LEAK_CB, + &cb); CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2); }