diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2015-12-23 15:31:14 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-12-26 11:02:46 +0000 |
| commit | f15c35d8daa71ce2a1388ffe46776900c1ffee35 (patch) | |
| tree | 3759940437f53e0cda65b2a3b35998812076e999 /external | |
| parent | c9c979a5adc137df89e50809e0f810464f60894c (diff) | |
Upload libvisio 0.1.4
Change-Id: Ia4cb506a95a150b8106187719e9104760409dea6
(cherry picked from commit ce014ac76678f186da27faadc973af3eb253c817)
Reviewed-on: https://gerrit.libreoffice.org/20952
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 4 | ||||
| -rw-r--r-- | external/libvisio/ubsan.patch | 15 |
2 files changed, 0 insertions, 19 deletions
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index 027c38e5b755..f9467c531296 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -13,10 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0)) -$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ - external/libvisio/ubsan.patch \ -)) - ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \ diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch deleted file mode 100644 index 16b0ec4bf71a..000000000000 --- a/external/libvisio/ubsan.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/lib/VSDParser.cpp -+++ src/lib/VSDParser.cpp -@@ -1104,7 +1104,11 @@ - input->seek(1, librevenge::RVNG_SEEK_CUR); - double scale = readDouble(input); - input->seek(1, librevenge::RVNG_SEEK_CUR); -- scale /= readDouble(input); -+ double scaleDenom = readDouble(input); -+ if (scaleDenom != 0) -+ { -+ scale /= scaleDenom; -+ } - - if (m_isStencilStarted && m_currentStencil) - { |