[Libreoffice-commits] core.git: external/epm

[Libreoffice Gerrit user]

 external/epm/UnpackedTarball_epm.mk |    1 +
 external/epm/asan.patch.0           |   15 +++++++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit 6567eb4f5b03366e6be2103a3f59a6f257b1f56f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 24 16:12:47 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Oct 24 20:41:15 2018 +0200

    external/epm: AddressSanitizer: strcpy-param-overlap
    
    ...during CustomTarget_instsetoo_native/install
    
    Change-Id: Ia796057b98044ccd227c150788d5caa1ef68eb25
    Reviewed-on: https://gerrit.libreoffice.org/62308
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/epm/UnpackedTarball_epm.mk b/external/epm/UnpackedTarball_epm.mk
index 922800b52142..c064a5bacc1e 100644
--- a/external/epm/UnpackedTarball_epm.mk
+++ b/external/epm/UnpackedTarball_epm.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL),,epm))
 
 $(eval $(call gb_UnpackedTarball_add_patches,epm,\
 	external/epm/epm-3.7.patch \
+	external/epm/asan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/epm/asan.patch.0 b/external/epm/asan.patch.0
new file mode 100644
index 000000000000..e3991eb1c569
--- /dev/null
+++ b/external/epm/asan.patch.0
@@ -0,0 +1,15 @@
+--- dist.c
++++ dist.c
+@@ -405,7 +405,11 @@
+   for (temp = platform->machine; *temp != '\0'; temp ++)
+     if (*temp == '-' || *temp == '_')
+     {
+-      strcpy(temp, temp + 1);
++      for (char * t2 = temp;; ++t2) {
++        char c = t2[1];
++        t2[0] = c;
++        if (c == '\0') break;
++      }
+       temp --;
+     }
+     else