summaryrefslogtreecommitdiff
path: root/external/epm
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-10-24 16:12:47 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-10-24 20:41:15 +0200
commit6567eb4f5b03366e6be2103a3f59a6f257b1f56f (patch)
tree8c62f4e058f9539fac2d28a57b8354f959f754c9 /external/epm
parentf62efe43a25770b8bcbe9b7bc681284b9a006ea0 (diff)
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@redhat.com>
Diffstat (limited to 'external/epm')
-rw-r--r--external/epm/UnpackedTarball_epm.mk1
-rw-r--r--external/epm/asan.patch.015
2 files changed, 16 insertions, 0 deletions
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