Annotate destructors to please coverity

Coverity flags this code as not handling exception that may happen in buffer().

My own analysis is that this can never happen because isBufferValid()
does check whether buffer_ is null.

Any insght appreciated. The commit should be expeanded to more cases, actually.

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 5d7f27f89ff4655732856731197f85874fa61f16..3d93904fdb3b07ffc9a7f4b28f030f2597f79d0f 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -112,8 +112,8 @@ public:
        /// reset associated Buffer to null value
        virtual void resetBuffer();
        /// retrieve associated Buffer
-       virtual Buffer & buffer();
-       virtual Buffer const & buffer() const;
+       Buffer & buffer();
+       Buffer const & buffer() const;
        /// Returns true if buffer_ actually points to a Buffer that has
        /// been loaded into LyX and is still open. Note that this will
        /// always return false for cloned Buffers. If you want to allow

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 18a261a3e0290d969730728a2e20683f41e1a3e1..1c8bc786db6ddb9130151fb96dcbbfe7c8ef988f 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -68,6 +68,9 @@ InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p)
 InsetBibitem::~InsetBibitem()
 {
        if (isBufferLoaded())
+               /* Coverity believs that this may throw an exception, but
+                * actually this code path is not taken when buffer_ == 0 */
+               // coverity[exn_spec_violation]
                buffer().invalidateBibinfoCache();
 }
 

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index ef794814aea8fb3bb4c8e671d04cc1a6b5e311bf..63ae8657f0bf9371f3fb1505f5e3564e6e052006 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -68,7 +68,11 @@ InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
 InsetBibtex::~InsetBibtex()
 {
        if (isBufferLoaded()) {
+               /* Coverity believs that this may throw an exception, but
+                * actually this code path is not taken when buffer_ == 0 */
+               // coverity[exn_spec_violation]
                buffer().invalidateBibfileCache();
+               // coverity[exn_spec_violation]
                buffer().removeBiblioTempFiles();
        }
 }

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index b2eca715054a7f1f82ab01740796e1f90ee42b13..1c80afffd7ba204289339f8bc4cc0d1864f52c1e 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -198,6 +198,9 @@ InsetInclude::InsetInclude(InsetInclude const & other)
 InsetInclude::~InsetInclude()
 {
        if (isBufferLoaded())
+               /* Coverity believs that this may throw an exception, but
+                * actually this code path is not taken when buffer_ == 0 */
+               // coverity[exn_spec_violation]
                buffer().invalidateBibfileCache();
        delete label_;
 }