dilfridge 14/12/27 15:12:21
Added: libabw-0.1.1-dereference-before-null-check.patch
libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
Log:
Version bump by Andreas Sturmlechner, bug 533478
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
84AD142F)
Revision Changes Path
1.1
app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch?rev=1.1&content-type=text/plain
Index: libabw-0.1.1-dereference-before-null-check.patch
===================================================================
From: David Tardon <[email protected]>
Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100)
Subject: coverity#1259904 dereference before null check
X-Git-Url:
https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3
coverity#1259904 dereference before null check
Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e
---
diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
index cf914bf..426ab54 100644
--- a/src/lib/ABWParser.cpp
+++ b/src/lib/ABWParser.cpp
@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr
reader)
void libabw::ABWParser::readM(xmlTextReaderPtr reader)
{
xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key"));
- m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
if (key)
+ {
+ m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
xmlFree(key);
+ }
}
void libabw::ABWParser::readHistory(xmlTextReaderPtr reader)
1.1
app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch?rev=1.1&content-type=text/plain
Index: libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
===================================================================
From: David Tardon <[email protected]>
Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100)
Subject: coverity#1259905 do not let AbiDocument::parse throw
X-Git-Url:
https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a
coverity#1259905 do not let AbiDocument::parse throw
This also fixes coverity#1259906 and coverity#1259907 .
Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790
---
diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp
index b8ab661..23ff750 100644
--- a/src/lib/AbiDocument.cpp
+++ b/src/lib/AbiDocument.cpp
@@ -110,7 +110,7 @@ is not protected
\return A value that indicates whether the conversion was successful and in
case it
was not, it indicates the reason of the error
*/
-ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input,
librevenge::RVNGTextInterface *textInterface)
+ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input,
librevenge::RVNGTextInterface *textInterface) try
{
ABW_DEBUG_MSG(("AbiDocument::parse\n"));
if (!input)
@@ -122,4 +122,9 @@ ABWAPI bool
libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre
return true;
return false;
}
+catch (...)
+{
+ return false;
+}
+
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
