summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-05-22 08:09:14 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-05-22 20:45:40 +0200
commit8b952c68c22bdd0e737fa67171c3a46f52607550 (patch)
tree02d3066ba79d5a0c0ab93a9acca5f2c77b200b4f /external
parentbcf6b0bc94eae1d9b19dc8d71eea72d2c54d228e (diff)
fdo#77313: coinmp: error: format not a string literal and no format arguments
Change-Id: I044f12c4b7b28963d6d491d5e5850ddb59a564c4 (cherry picked from commit 197f2016e3164702db168e11f98f42042092e68e)
Diffstat (limited to 'external')
-rw-r--r--external/coinmp/UnpackedTarball_coinmp.mk1
-rw-r--r--external/coinmp/werror-format-security.patch.012
2 files changed, 13 insertions, 0 deletions
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index d27d46cea615..831f65fd59af 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 000000000000..90c116b5b06d
--- /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_);