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

[Matúš Kukan]

 external/coinmp/UnpackedTarball_coinmp.mk      |    1 +
 external/coinmp/werror-format-security.patch.0 |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 197f2016e3164702db168e11f98f42042092e68e
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu May 22 08:09:14 2014 +0200

    fdo#77313: coinmp: error: format not a string literal and no format arguments
    
    Change-Id: I044f12c4b7b28963d6d491d5e5850ddb59a564c4

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index d27d46c..831f65f 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	external/coinmp/android.build.patch.1 \
 	external/coinmp/no-binaries.patch.1 \
+	external/coinmp/werror-format-security.patch.0 \
 	external/coinmp/windows.build.patch.1 \
 ))
 
diff --git a/external/coinmp/werror-format-security.patch.0 b/external/coinmp/werror-format-security.patch.0
new file mode 100644
index 0000000..90c116b
--- /dev/null
+++ b/external/coinmp/werror-format-security.patch.0
@@ -0,0 +1,12 @@
+diff -ur coinmp.org/CoinUtils/src/CoinMessageHandler.cpp coinmp/CoinUtils/src/CoinMessageHandler.cpp
+--- CoinUtils/src/CoinMessageHandler.cpp	2014-05-21 23:14:01.384874167 +0200
++++ CoinUtils/src/CoinMessageHandler.cpp	2014-05-21 23:14:47.708874712 +0200
+@@ -820,7 +820,7 @@
+ 	  sprintf(messageOut_,g_format_,doublevalue);
+ 	  if (next != format_+2) {
+ 	    messageOut_+=strlen(messageOut_);
+-	    sprintf(messageOut_,format_+2);
++	    sprintf(messageOut_,"%s",format_+2);
+ 	  }
+ 	}
+ 	messageOut_+=strlen(messageOut_);