From 74d200157ed954007bb98af959adba7c603329c7 Mon Sep 17 00:00:00 2001
From: Geod24 <pro.mathias.lang@gmail.com>
Date: Sun, 31 Jan 2021 16:57:59 +0900
Subject: [PATCH] libbacktrace: correct memory lengths in Mach-O dsym support

This cherry pick upstream commit:
https://github.com/ianlancetaylor/libbacktrace/commit/030bd0a7099026833e437280915f1248395e7d0f
---
 libbacktrace/macho.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libbacktrace/macho.cpp b/libbacktrace/macho.cpp
index 49f7b50a..bdfb2005 100644
--- a/libbacktrace/macho.cpp
+++ b/libbacktrace/macho.cpp
@@ -871,6 +871,7 @@ macho_add_dsym (struct backtrace_state *state, const char *filename,
   dsymsuffixdirlen = strlen (dsymsuffixdir);
 
   dsymlen = (dirnamelen
+	     + 1
 	     + basenamelen
 	     + dsymsuffixdirlen
 	     + basenamelen
@@ -893,7 +894,7 @@ macho_add_dsym (struct backtrace_state *state, const char *filename,
 
   if (diralc != NULL)
     {
-      backtrace_free (state, diralc, dirnamelen, error_callback, data);
+      backtrace_free (state, diralc, dirnamelen + 1, error_callback, data);
       diralc = NULL;
     }