Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 7 insertions, 0 deletions

diff --git a/src/buffer.c b/src/buffer.c
index f1cb4d50414..e441499aeb0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -28,6 +28,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#include <sanitizer/lsan_interface.h>
+#endif
+
 #include <verify.h>
 
 #include "lisp.h"
@@ -5083,6 +5087,9 @@ enlarge_buffer_text (struct buffer *b, ptrdiff_t delta)
 #else
   p = xrealloc (b->text->beg, new_nbytes);
 #endif
+#ifdef HAVE___LSAN_IGNORE_OBJECT
+  __lsan_ignore_object (p);
+#endif
 
   if (p == NULL)
     {