libvisio/libvisio-0.0.17.patch | 14 ++++++++++++++
libvisio/makefile.mk | 2 ++
libwpd/libwpd-0.9.4.patch | 18 ++++++++++++++++++
libwpd/makefile.mk | 3 +++
4 files changed, 37 insertions(+)
New commits:
commit 214c3b9002944ff5d05e249051e45f135e1b4943
Author: Fridrich Å trba <fridrich.st...@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: Fridrich Å trba <fridrich.st...@bluewin.ch>
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 18a3f64a8d2be07a610fc035ca61186510ad036f
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Sat Jun 9 00:10:56 2012 +0200
Fix crash from fdo#508686
Change-Id: If98cbbe880055a1e596eefe75744c41513c9aa16
Signed-off-by: Fridrich Å trba <fridrich.st...@bluewin.ch>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
