[Libreoffice-commits] .: icc/makefile.mk icc/SampleICC-1.3.2-fmtargs.patch

[Petr Mladek]

 icc/SampleICC-1.3.2-fmtargs.patch |   20 ++++++++++++++++++++
 icc/makefile.mk                   |    4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 1ba31530f2fa0ed392ebf7a411ced9a158b2736d
Author: Rafael Cabral <cabral at conectiva.com.br>
Date:   Thu Mar 31 19:47:01 2011 +0200

    buildfix-fmtargs.diff: sprintf arguments cleanup

diff --git a/icc/SampleICC-1.3.2-fmtargs.patch b/icc/SampleICC-1.3.2-fmtargs.patch
new file mode 100644
index 0000000..a7549a8
--- /dev/null
+++ b/icc/SampleICC-1.3.2-fmtargs.patch
@@ -0,0 +1,20 @@
+--- misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp  2009-01-20 11:48:36.000000000 -0500
++++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp     2009-01-19 14:41:23.000000000 -0500
+@@ -1155,7 +1155,7 @@
+
+   CIccInfo Info;
+   icChar buf[128];
+-  sprintf(buf, Info.GetSigName(m_Header.deviceClass));
++  sprintf(buf, "%s", Info.GetSigName(m_Header.deviceClass));
+   if (m_Header.deviceClass!=icSigInputClass && m_Header.deviceClass!=icSigDisplayClass) {
+     if (GetTag(icSigGrayTRCTag) || GetTag(icSigRedTRCTag) || GetTag(icSigGreenTRCTag) ||
+        GetTag(icSigBlueTRCTag) || GetTag(icSigRedColorantTag) || GetTag(icSigGreenColorantTag) ||
+@@ -1230,7 +1230,7 @@
+   for (i=m_Tags->begin(); i!=m_Tags->end(); i++) {
+     tagsig = i->TagInfo.sig;
+     typesig = i->pTag->GetType();
+-    sprintf(buf, Info.GetSigName(tagsig));
++    sprintf(buf, "%s", Info.GetSigName(tagsig));
+     if (!IsTypeValid(tagsig, typesig)) {
+       sReport += icValidateNonCompliantMsg;
+       sReport += buf;
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 87ebf3a..4bbde85 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -38,7 +38,9 @@ TARGET=icc
 
 TARFILE_NAME=SampleICC-1.3.2
 TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES= \
+    $(TARFILE_NAME).patch \
+    $(TARFILE_NAME)-fmtargs.patch
 
 CONVERTFILES= \
     IccProfLib$/IccTagProfSeqId.h \