From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 3 Aug 2020 22:21:59 +0000 (-0700)
Subject: Ignore another memory leak
X-Git-Tag: emacs-28.0.90~6842
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd50b3fc45d35549b842a3ac4889b10f7fcf574c;p=emacs.git

Ignore another memory leak

* src/pdumper.c (dump_mmap_contiguous_heap):
Ignore the heap control block when checking for leaks.
---

diff --git a/src/pdumper.c b/src/pdumper.c
index 865ceff6fff..63ee0fcb7f6 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4680,15 +4680,15 @@ dump_mmap_contiguous_heap (struct dump_memory_map *maps, int nr_maps,
      Beware: the simple patch 2019-03-11T15:20:54Z!eggert@cs.ucla.edu
      is worse, as it sometimes frees this storage twice.  */
   struct dump_memory_map_heap_control_block *cb = calloc (1, sizeof (*cb));
-
-  char *mem;
   if (!cb)
     goto out;
+  __lsan_ignore_object (cb);
+
   cb->refcount = 1;
   cb->mem = malloc (total_size);
   if (!cb->mem)
     goto out;
-  mem = cb->mem;
+  char *mem = cb->mem;
   for (int i = 0; i < nr_maps; ++i)
     {
       struct dump_memory_map *map = &maps[i];