[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 3 commits - external/libetonyek
David Tardon
dtardon at redhat.com
Tue May 26 08:29:46 PDT 2015
external/libetonyek/0001-add-missing-breaks.patch.1 | 36 ++++++++++++++++
external/libetonyek/0002-remove-surplus-breaks.patch.1 | 38 +++++++++++++++++
external/libetonyek/UnpackedTarball_libetonyek.mk | 11 ++++
external/libetonyek/ubsan-visibility.patch | 11 ++++
external/libetonyek/ubsan.patch | 11 ++++
5 files changed, 107 insertions(+)
New commits:
commit 1378814a8273a0c8f11fef7ca8c42315c33241bb
Author: David Tardon <dtardon at redhat.com>
Date: Tue May 26 17:17:03 2015 +0200
fix some problems found by coverity
Change-Id: Icaf543858298da4e6c8bb01c8820fa9755c3b7ae
(cherry picked from commit 06095843f3fbfabff7752f87042fb291185fc501)
diff --git a/external/libetonyek/0001-add-missing-breaks.patch.1 b/external/libetonyek/0001-add-missing-breaks.patch.1
new file mode 100644
index 0000000..7e11682
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-breaks.patch.1
@@ -0,0 +1,36 @@
+From 54c63c653deb070c49621bea8acbc18f76118238 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Tue, 26 May 2015 16:56:56 +0200
+Subject: [PATCH 1/2] add missing breaks
+
+Change-Id: I6a6afd517e61aff89319348de5af3aa97093bd1d
+---
+ src/lib/KEY2Parser.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index bb58efd..4ba70d2 100644
+--- a/src/lib/KEY2Parser.cpp
++++ b/src/lib/KEY2Parser.cpp
+@@ -261,8 +261,10 @@ void PointElement::attribute(const int name, const char *const value)
+ {
+ case IWORKToken::NS_URI_SFA | IWORKToken::x :
+ m_point.first = lexical_cast<double>(value);
++ break;
+ case IWORKToken::NS_URI_SFA | IWORKToken::y :
+ m_point.second = lexical_cast<double>(value);
++ break;
+ }
+ }
+
+@@ -358,6 +360,7 @@ void PointPathElement::attribute(const int name, const char *const value)
+ ETONYEK_DEBUG_MSG(("unknown point path type: %s\n", value));
+ break;
+ }
++ break;
+ }
+ default :
+ KEY2XMLElementContextBase::attribute(name, value);
+--
+2.4.1
+
diff --git a/external/libetonyek/0002-remove-surplus-breaks.patch.1 b/external/libetonyek/0002-remove-surplus-breaks.patch.1
new file mode 100644
index 0000000..be6b94a
--- /dev/null
+++ b/external/libetonyek/0002-remove-surplus-breaks.patch.1
@@ -0,0 +1,38 @@
+From 91d39222d9f120211c0189f69299898702a65d3d Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Tue, 26 May 2015 17:01:22 +0200
+Subject: [PATCH 2/2] remove surplus breaks
+
+Change-Id: Ib98a4a5bcd7d9f9eb03874f0715b45bb141ef12d
+---
+ src/lib/KEY2Parser.cpp | 1 -
+ src/lib/contexts/IWORKStylesContext.cpp | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index 4ba70d2..9a37dcd 100644
+--- a/src/lib/KEY2Parser.cpp
++++ b/src/lib/KEY2Parser.cpp
+@@ -124,7 +124,6 @@ IWORKXMLContextPtr_t StylesContext::element(const int name)
+ return makeContext<KEY2StyleContext>(getState(), name);
+
+ case IWORKToken::NS_URI_SF | IWORKToken::layoutstyle_ref :
+- break;
+ return makeContext<KEY2StyleRefContext>(getState(), name, false, m_anonymous);
+ }
+
+diff --git a/src/lib/contexts/IWORKStylesContext.cpp b/src/lib/contexts/IWORKStylesContext.cpp
+index ef3041b..24efa1d 100644
+--- a/src/lib/contexts/IWORKStylesContext.cpp
++++ b/src/lib/contexts/IWORKStylesContext.cpp
+@@ -43,7 +43,6 @@ IWORKXMLContextPtr_t IWORKStylesContext::element(const int name)
+ case IWORKToken::NS_URI_SF | IWORKToken::liststyle_ref :
+ case IWORKToken::NS_URI_SF | IWORKToken::paragraphstyle_ref :
+ case IWORKToken::NS_URI_SF | IWORKToken::vector_style_ref :
+- break;
+ return makeContext<IWORKStyleRefContext>(getState(), name, false, m_anonymous);
+ }
+
+--
+2.4.1
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 834bef2b..24167e5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -18,6 +18,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
+ external/libetonyek/0001-add-missing-breaks.patch.1 \
+ external/libetonyek/0002-remove-surplus-breaks.patch.1 \
))
ifeq ($(COM_GCC_IS_CLANG),TRUE)
commit 6b72769c1e61b86b579b6dd8b0c221c9e618fe1a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 21 16:25:54 2015 +0100
external/libetonyek: -fsanitize=enum
e.g., during CppunitTest_writerperfect_impress
Change-Id: Ib9eb7a9ba7c9bad9cc43fbe2132ca315e2f28c0a
(cherry picked from commit 15cc77f8d3d1edfd0e8114829bc4b340c3d73b4d)
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index c531894..834bef2b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/assert.patch \
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
+ external/libetonyek/ubsan.patch \
))
ifeq ($(COM_GCC_IS_CLANG),TRUE)
diff --git a/external/libetonyek/ubsan.patch b/external/libetonyek/ubsan.patch
new file mode 100644
index 0000000..f0ab147
--- /dev/null
+++ b/external/libetonyek/ubsan.patch
@@ -0,0 +1,11 @@
+--- src/lib/contexts/IWORKPropertyMapElement.cpp
++++ src/lib/contexts/IWORKPropertyMapElement.cpp
+@@ -264,7 +264,7 @@
+
+ void AlignmentElement::endOfElement()
+ {
+- IWORKAlignment prop;
++ IWORKAlignment prop = IWORK_ALIGNMENT_LEFT;
+
+ if (m_value)
+ {
commit 4dafb7d37f2e2e78708b36fb474f0a59b60bbd03
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 21 15:29:59 2015 +0100
For Clang -fsanitize=vptr use -fvisibility-ms-compat, not -fvisibility=hidden
...same as f0aa1a78fb209310e8baef53c02f365fca518d11
Change-Id: Ib02a20677eaaf2930bf3620c4ed2b1c3c098ce00
(cherry picked from commit 1dbc9e022e750a16dbf5b530783c4adaafd609f5)
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 4706d02..c531894 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,4 +19,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/win_build.patch.1 \
))
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
+ external/libetonyek/ubsan-visibility.patch \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ubsan-visibility.patch b/external/libetonyek/ubsan-visibility.patch
new file mode 100644
index 0000000..925f4a8
--- /dev/null
+++ b/external/libetonyek/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -17443,7 +17443,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
+ $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
+ saved_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++ CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
More information about the Libreoffice-commits
mailing list