[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - external/breakpad

[Christian Lohmaier (via logerrit)]

 external/breakpad/UnpackedTarball_breakpad.mk |    1 +
 external/breakpad/breakpad-no-env.patch.1     |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit e170e08e009642ccdea5db490dc5dd038b45c04d
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Sat Jun 19 15:57:21 2021 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jul 8 10:30:46 2021 +0200

    breakpad: don't include the users's env in linux dumps
    
    Change-Id: I004b862295686789c0a88dc678bd098d81c76421
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117503
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit 47282cc577eda78b9cceff0860e74ce7b3f121cd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117728

diff --git a/external/breakpad/UnpackedTarball_breakpad.mk b/external/breakpad/UnpackedTarball_breakpad.mk
index 4eb10158ca18..1b92728946cd 100644
--- a/external/breakpad/UnpackedTarball_breakpad.mk
+++ b/external/breakpad/UnpackedTarball_breakpad.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
 	external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 \
 	external/breakpad/c++20-allocator.patch \
 	external/breakpad/breakpad-dump_syms.patch.1 \
+	external/breakpad/breakpad-no-env.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_files,breakpad,src/tools/windows/dump_syms,\
diff --git a/external/breakpad/breakpad-no-env.patch.1 b/external/breakpad/breakpad-no-env.patch.1
new file mode 100644
index 000000000000..d1b37bd21868
--- /dev/null
+++ b/external/breakpad/breakpad-no-env.patch.1
@@ -0,0 +1,13 @@
+diff -ur breakpad.org/src/client/linux/minidump_writer/minidump_writer.cc breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+--- breakpad.org/src/client/linux/minidump_writer/minidump_writer.cc	2021-06-19 15:32:57.258078847 +0200
++++ breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2021-06-19 15:35:07.014082452 +0200
+@@ -289,7 +289,8 @@
+     dir.CopyIndex(dir_index++, &dirent);
+ 
+     dirent.stream_type = MD_LINUX_ENVIRON;
+-    if (!WriteProcFile(&dirent.location, GetCrashThread(), "environ"))
++    // don't include the user's env
++    if (true || !WriteProcFile(&dirent.location, GetCrashThread(), "environ"))
+       NullifyDirectoryEntry(&dirent);
+     dir.CopyIndex(dir_index++, &dirent);
+