diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-01-21 08:44:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-21 10:51:33 +0000 |
| commit | f14eddb9c8ba5c83e6699ec3f2ce57ea80cc8e8f (patch) | |
| tree | cbcba0cafdb0b45f39d1462d4dea1d7b237c9d6b | |
| parent | 54a8a941c0c5f0a11c8c4fd40617bfdbb40c07ed (diff) | |
Coverity: Potential crash (?)
Change-Id: I819b0df446cf95d511d6a7a5a65c381a2a837d00
(cherry picked from commit 7989850e9fc5fb2fb757ecf388b51bc3e96a0267)
Reviewed-on: https://gerrit.libreoffice.org/7563
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/libabw/UnpackedTarball_libabw.mk | 1 | ||||
| -rw-r--r-- | external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index c61f2d55924b..4f8b44002efa 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,libabw,\ external/libabw/libabw-0.0.1-inttypes.patch.1 \ + external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 new file mode 100644 index 000000000000..fccaa8ee2173 --- /dev/null +++ b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 @@ -0,0 +1,11 @@ +--- a/src/lib/ABWContentCollector.cpp ++++ b/src/lib/ABWContentCollector.cpp +@@ -643,7 +643,7 @@ void libabw::ABWContentCollector::collectHeaderFooter(const char *id, const char + if (!type) + m_ps->m_currentHeaderFooterId = -1; + +- std::string sType(type); ++ std::string sType(type ? type : ""); + boost::trim(sType); + std::vector<std::string> strVec; + boost::algorithm::split(strVec, sType, boost::is_any_of("-"), boost::token_compress_on); |