diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-06-15 13:56:58 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-06-15 15:29:57 +0200 |
| commit | eff3a0e80bb027bf2d5809639a469cbee110089d (patch) | |
| tree | 4cc28a717ee5a5ceb67fa171956d9d18527b2070 | |
| parent | c4f98ade34ececc65bda8cac979f33eda6e29c4e (diff) | |
tdf#133987: initialize dbg_help to avoid dereferencing stack garbage
Change-Id: Iee9263db201a544d5fe7e0952b48648ea7a16036
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96323
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1 | ||||
| -rw-r--r-- | external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index 681731506f28..73251661c9a3 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-win32-macro.patch.1) \ $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \ $(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \ + external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 \ external/gpgmepp/w32-build-fixes-2.patch \ $(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \ $(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \ diff --git a/external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 b/external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 new file mode 100644 index 000000000000..1b5e22a7eccd --- /dev/null +++ b/external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 @@ -0,0 +1,30 @@ +From fe2892618c20cd40c342cce26ffb6ac4644fd3c3 Mon Sep 17 00:00:00 2001 +From: Andre Heinecke <aheinecke@gnupg.org> +Date: Mon, 28 Oct 2019 16:00:29 +0100 +Subject: [PATCH 1/1] core,w32: Initialize dbg_help for socket debugging + +* src/w32-io.c (_gpgme_io_select): Initialize dbg_help. + +-- +This fixes a crash on Windows because dbg_help might +be used unitialized. +--- + src/w32-io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/w32-io.c b/src/w32-io.c +index c5c21f59..80978f9a 100644 +--- a/src/w32-io.c ++++ b/src/w32-io.c +@@ -1643,7 +1643,7 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock) + int i; + int any; + int count; +- void *dbg_help; ++ void *dbg_help = NULL; + TRACE_BEG (DEBUG_SYSIO, "_gpgme_io_select", fds, + "nfds=%u, nonblock=%u", nfds, nonblock); + +-- +2.11.0 + |