|
From: Paul F. <pa...@so...> - 2023-09-02 21:46:06
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=1e197de36e1d116294d2f19c4d47fb91a6611208 commit 1e197de36e1d116294d2f19c4d47fb91a6611208 Author: Paul Floyd <pj...@wa...> Date: Sat Sep 2 23:43:31 2023 +0200 coverity: fix a couple of forward nulls In the new sized/aligned memcheck code. Diff: --- memcheck/mc_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c index 90b89a9115..3f34e3dc19 100644 --- a/memcheck/mc_main.c +++ b/memcheck/mc_main.c @@ -7305,7 +7305,7 @@ static Bool mc_handle_client_request ( ThreadId tid, UWord* arg, UWord* ret ) if (mc && mc->szB != aligned_alloc_info->size) { MC_(record_size_mismatch_error) ( tid, mc, aligned_alloc_info->size, "new/delete"); } - if (aligned_alloc_info->orig_alignment != mc->alignB) { + if (mc && aligned_alloc_info->orig_alignment != mc->alignB) { MC_(record_align_mismatch_error) ( tid, mc, aligned_alloc_info->orig_alignment, "new/delete"); } if (aligned_alloc_info->orig_alignment == 0 || @@ -7318,7 +7318,7 @@ static Bool mc_handle_client_request ( ThreadId tid, UWord* arg, UWord* ret ) if (mc && mc->szB != aligned_alloc_info->size) { MC_(record_size_mismatch_error) ( tid, mc, aligned_alloc_info->size, "new[]/delete[]" ); } - if (aligned_alloc_info->orig_alignment != mc->alignB) { + if (mc && aligned_alloc_info->orig_alignment != mc->alignB) { MC_(record_align_mismatch_error) ( tid, mc, aligned_alloc_info->orig_alignment, "new[]/delete[]"); } if (aligned_alloc_info->orig_alignment == 0 || |