[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - libvisio/libvisio-0.0.16-fdo50178.patch libvisio/libvisio-0.0.16-nothrow.patch libvisio/libvisio-0.0.16.patch libvisio/libvisio-0.0.17.patch libvisio/makefile.mk libwpd/libwpd-0.9.4.patch libwpd/makefile.mk ooo.lst.in
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Jun 11 02:43:23 PDT 2012
libvisio/libvisio-0.0.16-fdo50178.patch | 29 -----------------------------
libvisio/libvisio-0.0.16-nothrow.patch | 31 -------------------------------
libvisio/libvisio-0.0.16.patch | 20 --------------------
libvisio/libvisio-0.0.17.patch | 14 ++++++++++++++
libvisio/makefile.mk | 9 +++------
libwpd/libwpd-0.9.4.patch | 18 ++++++++++++++++++
libwpd/makefile.mk | 3 +++
ooo.lst.in | 2 +-
8 files changed, 39 insertions(+), 87 deletions(-)
New commits:
commit a6ae36d10d08161d81a3d3f8593d8d543daaef13
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Jun 9 00:12:08 2012 +0200
Fix potential further crashes like the one in fdo#50868
Change-Id: I8bdce8091d7f93b311cb4e15134eb2d7c34ae22f
Signed-off-by: Michael Meeks <michael.meeks at suse.com>
diff --git a/libwpd/libwpd-0.9.4.patch b/libwpd/libwpd-0.9.4.patch
new file mode 100644
index 0000000..e7892be
--- /dev/null
+++ b/libwpd/libwpd-0.9.4.patch
@@ -0,0 +1,18 @@
+--- misc/libwpd-0.9.4/src/lib/WPXBinaryData.cpp 2011-10-28 15:37:48.000000000 +0200
++++ misc/build/libwpd-0.9.4/src/lib/WPXBinaryData.cpp 2012-06-09 00:02:43.293981048 +0200
+@@ -174,7 +174,14 @@
+ const WPXInputStream *WPXBinaryData::getDataStream() const
+ {
+ if (m_binaryDataImpl->m_stream)
++ {
+ delete (m_binaryDataImpl->m_stream);
+- return ((m_binaryDataImpl->m_stream) = new WPXMemoryInputStream(&(m_binaryDataImpl->m_buf[0]), m_binaryDataImpl->m_buf.size()));
++ m_binaryDataImpl->m_stream = 0;
++ }
++ if (m_binaryDataImpl->m_buf.empty())
++ return 0;
++ m_binaryDataImpl->m_stream = new WPXMemoryInputStream(&(m_binaryDataImpl->m_buf[0]), m_binaryDataImpl->m_buf.size());
++ return m_binaryDataImpl->m_stream;
+ }
++
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 5e0bfd5..504fb48 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -49,6 +49,9 @@ TARFILE_MD5=c01351d7db2b205de755d58769288224
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
+PATCH_FILES=\
+ $(TARFILE_NAME).patch
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
commit ee606fd51b8975aa67a29dd778d67eb7dd247a2c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Jun 9 00:10:56 2012 +0200
Fix crash from fdo#50868
Change-Id: If98cbbe880055a1e596eefe75744c41513c9aa16
Signed-off-by: Michael Meeks <michael.meeks at suse.com>
diff --git a/libvisio/libvisio-0.0.17.patch b/libvisio/libvisio-0.0.17.patch
new file mode 100644
index 0000000..c2b1309
--- /dev/null
+++ b/libvisio/libvisio-0.0.17.patch
@@ -0,0 +1,14 @@
+--- misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp 2012-05-31 15:14:42.000000000 +0200
++++ misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp 2012-06-09 00:08:24.139051461 +0200
+@@ -2059,7 +2059,11 @@
+
+ void libvisio::VSDXContentCollector::_convertDataToString(WPXString &result, const WPXBinaryData &data, TextFormat format)
+ {
++ if (!data.size())
++ return;
+ WPXInputStream *pStream = const_cast<WPXInputStream *>(data.getDataStream());
++ if (!pStream)
++ return;
+ if (format == VSD_TEXT_ANSI)
+ {
+ while (!pStream->atEOS())
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 0c4a604..ac76289 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -57,6 +57,8 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
TARFILE_NAME=libvisio-0.0.17
TARFILE_MD5=90010e213dd25648e70f0cc12f8fed55
+PATCH_FILES=\
+ $(TARFILE_NAME).patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
commit 43cc13e7fc16663ffcebcdac47ef174aa54a4fd1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu May 31 15:53:34 2012 +0200
Uploading the libvisio 0.0.17 release
Change-Id: Ib517cec1709e331f60aca4f0d6968da41d14b228
Signed-off-by: Michael Meeks <michael.meeks at suse.com>
diff --git a/libvisio/libvisio-0.0.16-fdo50178.patch b/libvisio/libvisio-0.0.16-fdo50178.patch
deleted file mode 100644
index e05887a..0000000
--- a/libvisio/libvisio-0.0.16-fdo50178.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- misc/build/libvisio-0.0.16/src/lib/VSDXContentCollector.cpp 2012-04-14 17:29:03.000000000 +0200
-+++ misc/libvisio-0.0.16/src/lib/VSDXContentCollector.cpp 2012-05-23 22:30:44.542099908 +0200
-@@ -1470,7 +1470,8 @@
- /* NURBS with incomplete data */
- void libvisio::VSDXContentCollector::collectNURBSTo(unsigned id, unsigned level, double x2, double y2, double knot, double knotPrev, double weight, double weightPrev, unsigned dataID)
- {
-- std::map<unsigned, NURBSData>::const_iterator iter;
-+ std::map<unsigned, NURBSData>::const_iterator iter;
-+ std::map<unsigned, NURBSData>::const_iterator iterEnd;
- NURBSData data;
- if (dataID == 0xFFFFFFFE) // Use stencil NURBS data
- {
-@@ -1490,13 +1491,15 @@
- }
- dataID = tmpElement->m_dataID;
- iter = m_stencilShape->m_nurbsData.find(dataID);
-+ iterEnd = m_stencilShape->m_nurbsData.end();
- }
- else // No stencils involved, directly get dataID and fill in missing parts
- {
- iter = m_NURBSData.find(dataID);
-+ iterEnd = m_NURBSData.end();
- }
-
-- if (iter != m_NURBSData.end())
-+ if (iter != iterEnd)
- {
- data = iter->second;
- data.knots.push_back(knot);
diff --git a/libvisio/libvisio-0.0.16-nothrow.patch b/libvisio/libvisio-0.0.16-nothrow.patch
deleted file mode 100644
index 42b8efe..0000000
--- a/libvisio/libvisio-0.0.16-nothrow.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- misc/libvisio-0.0.16/src/lib/VisioDocument.cpp 2012-04-13 10:54:19.000000000 +0200
-+++ misc/build/libvisio-0.0.16/src/lib/VisioDocument.cpp 2012-05-16 15:16:08.974375389 +0200
-@@ -45,10 +45,13 @@
- */
- bool libvisio::VisioDocument::isSupported(WPXInputStream *input)
- {
-+ WPXInputStream *tmpDocStream = 0;
-+ try
-+ {
- input->seek(0, WPX_SEEK_SET);
- if (!input->isOLEStream())
- return false;
-- WPXInputStream *tmpDocStream = input->getDocumentOLEStream("VisioDocument");
-+ tmpDocStream = input->getDocumentOLEStream("VisioDocument");
- if (!tmpDocStream)
- return false;
-
-@@ -64,6 +67,13 @@
- {
- return true;
- }
-+ }
-+ catch (...)
-+ {
-+ if (tmpDocStream)
-+ delete tmpDocStream;
-+ return false;
-+ }
-
- return false;
- }
diff --git a/libvisio/libvisio-0.0.16.patch b/libvisio/libvisio-0.0.16.patch
deleted file mode 100644
index 6a8824f..0000000
--- a/libvisio/libvisio-0.0.16.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libvisio-0.0.16/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.16/src/lib/libvisio_utils.h
-@@ -42,17 +42,8 @@
-
- #else
-
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#endif
-
- #endif
-
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 29e8658..0c4a604 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,13 +54,8 @@ INCPRE+=$(WPG_CFLAGS)
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
.ENDIF
-TARFILE_NAME=libvisio-0.0.16
-TARFILE_MD5=2fa6028324347860e684e75310818d43
-
-PATCH_FILES=\
- $(TARFILE_NAME)-nothrow.patch \
- $(TARFILE_NAME)-fdo50178.patch \
- $(TARFILE_NAME).patch
+TARFILE_NAME=libvisio-0.0.17
+TARFILE_MD5=90010e213dd25648e70f0cc12f8fed55
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
diff --git a/ooo.lst.in b/ooo.lst.in
index 4a048af..2b3268b 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
+90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
@GOOGLE_DOCS_EXTENSION_PACK@
More information about the Libreoffice-commits
mailing list