From 98dc349c0126503a9da8ad4fb8395580f111f243 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 18 Oct 2018 13:10:06 +0100 Subject: [PATCH] annobin: Suppress a call to free() as it is triggering a memory fault. --- annocheck/annocheck.c | 2 +- plugin/annobin.cc | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/annocheck/annocheck.c b/annocheck/annocheck.c index 93a2ce7..6aaf390 100644 --- a/annocheck/annocheck.c +++ b/annocheck/annocheck.c @@ -29,7 +29,7 @@ ulong verbosity = 0; uint major_version = 8; -uint minor_version = 56; +uint minor_version = 57; static ulong num_files = 0; static const char * files[MAX_NUM_FILES]; diff --git a/plugin/annobin.cc b/plugin/annobin.cc index b4a3f33..f6b4769 100644 --- a/plugin/annobin.cc +++ b/plugin/annobin.cc @@ -26,8 +26,8 @@ /* The version of the annotation specification supported by this plugin. */ #define SPEC_VERSION 3 -static unsigned int annobin_version = 856; /* NB. Keep in sync with version_string below. */ -static const char * version_string = N_("Version 856"); +static unsigned int annobin_version = 857; /* NB. Keep in sync with version_string below. */ +static const char * version_string = N_("Version 857"); @@ -1251,7 +1251,10 @@ emit_queued_attachments (void) free ((void *) item->section_name); free ((void *) item->group_name); next = item->next; - free ((void *) item); + // FIXME: BZ #1638371 reports that this free() triggers an "invalid pointer" + // error when running under MALLOC_CHECK_. I have no idea why, as the + // pointer certainly looks valid to me. So for now, suppress the free. + // free ((void *) item); } } -- 2.43.5