diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-06-09 00:10:56 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-06-09 00:10:56 +0200 |
| commit | e71749a089fa3e6463b80413b638f7dc32921a07 (patch) | |
| tree | c7a4e2799abd3391f71e39e59f1120bc4c73104e | |
| parent | 2a72e15e6a16fe71d91e5a7804168c8077b2e456 (diff) | |
Fix crash from fdo#508686
Change-Id: If98cbbe880055a1e596eefe75744c41513c9aa16
| -rw-r--r-- | libvisio/libvisio-0.0.17.patch | 14 | ||||
| -rw-r--r-- | libvisio/makefile.mk | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libvisio/libvisio-0.0.17.patch b/libvisio/libvisio-0.0.17.patch new file mode 100644 index 000000000000..c2b1309a3709 --- /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 0c4a60404207..ac76289dd7f5 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 |