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

[Stephan Bergmann]

 external/coinmp/UnpackedTarball_coinmp.mk |    1 +
 external/coinmp/ubsan.patch.0             |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit c8346d77e73bdbe82a1eb73dd83c34ada8c68b17
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 17:35:20 2015 +0200

    external/coinmp: -fsanitize=nonnull-attribute
    
    Change-Id: I487e772395defa9aae2ce3eb040b8c7d92720cb2

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index 635deff..aad0cd3 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	) \
 	$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
 	external/coinmp/werror-format-pedantic.patch.0 \
+	external/coinmp/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/ubsan.patch.0 b/external/coinmp/ubsan.patch.0
new file mode 100644
index 0000000..1573329
--- /dev/null
+++ b/external/coinmp/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- Clp/src/ClpParameters.hpp
++++ Clp/src/ClpParameters.hpp
+@@ -81,7 +81,7 @@
+ template <class T> inline void
+ ClpDisjointCopyN( const T * array, const int size, T * newArray)
+ {
+-     memcpy(reinterpret_cast<void *> (newArray), array, size * sizeof(T));
++     if (size != 0) memcpy(reinterpret_cast<void *> (newArray), array, size * sizeof(T));
+ }
+ /// And set
+ template <class T> inline void